David Yip ab04be2f84 Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	config/i18n-tasks.yml

2018-03-18 20:21:17 -05:00

..

chewy

Full-text search for authorized statuses (#6423)

2018-02-09 23:04:47 +01:00

controllers

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-18 16:17:15 +00:00

helpers

Merge remote-tracking branch 'origin/master' into gs-master

2018-03-18 20:21:17 -05:00

javascript

Merge remote-tracking branch 'origin/master' into gs-master

2018-03-18 20:21:17 -05:00

lib

Merge remote-tracking branch 'origin/master' into gs-master

2018-03-18 20:21:17 -05:00

mailers

Account archive download (#6460)

2018-02-21 23:21:32 +01:00

models

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-17 17:17:21 +00:00

policies

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

presenters

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

serializers

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-09 00:17:17 +00:00

services

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-17 17:17:21 +00:00

validators

…

views

Merge remote-tracking branch 'origin/master' into gs-master

2018-03-18 20:21:17 -05:00

workers

Log BackupWorker backtrace, delete Backup if retries exhausted (#6769)

2018-03-13 08:15:24 +01:00