mastodon/app
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
 	README.md
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/serializers/rest/instance_serializer.rb
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/simple_form.ja.yml
2018-03-02 21:46:44 -06:00
..
chewy Full-text search for authorized statuses (#6423) 2018-02-09 23:04:47 +01:00
controllers Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -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 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
lib Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
mailers Account archive download (#6460) 2018-02-21 23:21:32 +01:00
models Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06: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 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
services Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -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 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
workers Account archive download (#6460) 2018-02-21 23:21:32 +01:00