Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +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	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
concerns	Cleanup various controllers (#10972)	2019-06-05 14:02:59 +02: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-06-10 18:59:53 +02:00
well_known	Allow turning keybase off instance-wide	2019-04-19 00:57:39 +02: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-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	Fix login sometimes redirecting to paths that are not pages (#11019)	2019-06-10 12:28:13 +02:00
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-26 16:02:54 +01:00
emojis_controller.rb	Cleanup various controllers (#10972)	2019-06-05 14:02:59 +02:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-15 17:11:40 +02:00
intents_controller.rb
invites_controller.rb
manifests_controller.rb	Fix login sometimes redirecting to paths that are not pages (#11019)	2019-06-10 12:28:13 +02:00
media_controller.rb	Fix login sometimes redirecting to paths that are not pages (#11019)	2019-06-10 12:28:13 +02:00
media_proxy_controller.rb	Fix login sometimes redirecting to paths that are not pages (#11019)	2019-06-10 12:28:13 +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-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-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	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00