Thibaut Girka a4c9bda771 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.		2018-05-21 16:40:02 +02:00
..
activitypub	Better pagination for ActivityPub outbox (#7356)	2018-05-04 19:19:11 +02:00
admin	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-21 16:40:02 +02:00
auth	…
concerns	HTTP signatures spec no longer requires algorithms field (#7525)	2018-05-17 04:03:28 +02:00
oauth	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-19 22:41:10 +02:00
settings	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
well_known	…
about_controller.rb	…
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
application_controller.rb	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
authorize_follows_controller.rb	…
emojis_controller.rb	…
follower_accounts_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
following_accounts_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
home_controller.rb	…
intents_controller.rb	…
invites_controller.rb	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
manifests_controller.rb	…
media_controller.rb	…
media_proxy_controller.rb	Raise Mastodon::RaceConditionError if Redis lock failed (#7511)	2018-05-16 12:29:45 +02:00
remote_follow_controller.rb	…
remote_unfollows.rb	…
shares_controller.rb	Merge branch 'master' into glitch-soc/merge	2018-05-11 18:12:42 +02:00
statuses_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
stream_entries_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
tags_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00