Thibaut Girka 20d01a954e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.		2019-05-26 15:41:40 +02:00
..
activitypub
admin	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-15 17:11:40 +02:00
api
auth
concerns
oauth
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-26 15:41:40 +02:00
well_known
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	Restful refactor of accounts/ routes (#2133)	2017-04-19 13:52:37 +02:00
accounts_controller.rb
application_controller.rb
authorize_interactions_controller.rb
custom_css_controller.rb	Add admin custom CSS setting (#8399)	2018-08-24 04:33:27 +02:00
directories_controller.rb
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
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
relationships_controller.rb
remote_follow_controller.rb
remote_interaction_controller.rb
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
stream_entries_controller.rb
tags_controller.rb