mastodon/app
Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/accounts_controller.rb
	app/javascript/mastodon/locales/pl.json
	app/views/about/more.html.haml

Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.

Conflicts in `pl.json` resolved by taking upstream's changes.

Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
2018-08-10 16:22:31 +02:00
..
chewy Full-text search for authorized statuses (#6423) 2018-02-09 23:04:47 +01:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
mailers Account archive download (#6460) 2018-02-21 23:21:32 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
policies Disallow remote users from viewing local-only toots 2018-07-31 15:41:04 +02:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2018-07-26 21:22:43 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
workers Fix ActivityPub::UpdateDistributionWorker regression (#8039) 2018-07-16 18:43:22 +02:00