Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		2018-10-01 12:43:20 +02:00
..
activitypub	…
admin	…
api	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-19 21:46:01 +02:00
concerns	…
oauth	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-11 16:51:26 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
well_known	…
about_controller.rb	…
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	…
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-09-11 16:51:26 +02:00
authorize_interactions_controller.rb	…
custom_css_controller.rb	…
emojis_controller.rb	…
filters_controller.rb	…
follower_accounts_controller.rb	…
following_accounts_controller.rb	…
home_controller.rb	…
intents_controller.rb	…
invites_controller.rb	…
manifests_controller.rb	…
media_controller.rb	…
media_proxy_controller.rb	…
remote_follow_controller.rb	…
remote_interaction_controller.rb	…
remote_unfollows_controller.rb	…
shares_controller.rb	…
statuses_controller.rb	…
stream_entries_controller.rb	…
tags_controller.rb	…