Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb		2019-06-07 17:00:36 +02:00
..
activitypub	Cleanup various controllers (#10972)	2019-06-05 14:02:59 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
api	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	2019-06-04 20:40:19 +02:00
auth
concerns
oauth	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
settings
well_known	Allow turning keybase off instance-wide	2019-04-19 00:57:39 +02:00
about_controller.rb
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
authorize_interactions_controller.rb
custom_css_controller.rb
directories_controller.rb
emojis_controller.rb
filters_controller.rb
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
home_controller.rb
intents_controller.rb
invites_controller.rb
manifests_controller.rb	Make Chrome splash screen same color as web UI's background color (#5169)	2017-10-02 01:23:32 +02:00
media_controller.rb
media_proxy_controller.rb
public_timelines_controller.rb
relationships_controller.rb
remote_follow_controller.rb
remote_interaction_controller.rb
remote_unfollows_controller.rb
shares_controller.rb
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
stream_entries_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
tags_controller.rb