Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		2019-04-10 09:16:08 +02:00
..
activitypub	Cache featured collections, as well as outbox, followers and following (#10467)	2019-04-04 01:30:44 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
concerns	Mark the 410 gone response for suspended accounts as cachable (#10339)	2019-03-21 23:33:18 +01:00
oauth	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
well_known	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02: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	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
emojis_controller.rb
filters_controller.rb
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-04 14:53:52 +02:00
following_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-04 14:53:52 +02:00
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
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-28 13:01:33 +01:00
remote_follow_controller.rb
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
remote_unfollows_controller.rb
shares_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
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