Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.		2019-03-20 13:54:00 +01:00
..
activitypub
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 13:54:00 +01:00
api	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 13:54:00 +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	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-03-20 13:54:00 +01: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-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	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-20 16:49:23 +01:00
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	Raise Mastodon::RaceConditionError if Redis lock failed (#7511)	2018-05-16 12:29:45 +02:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
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