Thibaut Girka 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.		2019-03-18 18:03:27 +01:00
..
activitypub
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
concerns	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
oauth
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-16 14:14:20 +01:00
well_known
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-18 18:03:27 +01:00
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-18 18:03:27 +01: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-03-18 18:03:27 +01:00
following_accounts_controller.rb
home_controller.rb
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb
media_proxy_controller.rb
public_timelines_controller.rb	[Glitch] Redesign landing page	2019-03-13 15:53:00 +01:00
relationships_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-18 18:03:27 +01:00
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-03-18 18:03:27 +01:00
stream_entries_controller.rb
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00