Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
accounts	Improve status pin query (#11972)	2019-09-27 15:23:30 +02:00
admin	…
apps	…
featured_tags	…
instances	…
lists	…
polls	…
push	…
statuses	…
timelines	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-13 18:13:43 +02:00
accounts_controller.rb	Change silences to always require approval on follow (#11975)	2019-09-27 21:13:51 +02:00
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	…
conversations_controller.rb	…
custom_emojis_controller.rb	Change unlisted custom emoji to not appear in autosuggestions (#11818)	2019-09-13 16:01:09 +02:00
directories_controller.rb	…
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	…
featured_tags_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	…
instances_controller.rb	…
lists_controller.rb	…
markers_controller.rb	…
media_controller.rb	…
mutes_controller.rb	…
notifications_controller.rb	…
polls_controller.rb	…
preferences_controller.rb	…
reports_controller.rb	…
scheduled_statuses_controller.rb	…
statuses_controller.rb	…
streaming_controller.rb	…
suggestions_controller.rb	…
trends_controller.rb	…