mastodon/app
David Yip 3d033a4687
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts:
	Gemfile
	config/locales/simple_form.pl.yml
2018-02-17 00:02:37 -06: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 merge-upstream 2018-02-17 00:02:37 -06:00
helpers Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-28 22:45:17 -06:00
javascript Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-17 00:02:37 -06:00
lib Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-02-11 04:10:16 +00:00
mailers Make sure status is not nil (#6428) 2018-02-04 12:31:46 +01:00
models Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-17 00:02:37 -06:00
policies Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-02 14:17:11 +00:00
presenters Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-06 20:17:13 +00:00
serializers Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -06:00
services Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-17 00:02:37 -06:00
validators Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
views Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-17 00:02:37 -06:00
workers Rename ResolveRemoteAccountService to ResolveAccountService (#6327) 2018-01-22 14:25:09 +01:00