Thibaut Girka 8b4abaa90d Merge branch 'master' into glitch-soc/master ... Conflicts: config/routes.rb Added the “endorsements” route from upstream.		2018-08-21 18:24:48 +02:00
..
activitypub	…
admin	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-19 09:27:18 +02:00
api	Merge branch 'master' into glitch-soc/master	2018-08-21 18:24:48 +02:00
auth	…
concerns	…
oauth	…
settings	…
well_known	…
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-10 16:22:31 +02:00
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'master' into glitch-soc/master	2018-08-21 18:24:48 +02:00
application_controller.rb	Merge branch 'master' into glitch-soc/master	2018-08-21 18:24:48 +02:00
authorize_interactions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
emojis_controller.rb	Unuse ActiveRecord::Base#cache_key (#8185)	2018-08-19 15:52:38 +02:00
filters_controller.rb	…
follower_accounts_controller.rb	…
following_accounts_controller.rb	…
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-11 15:45:42 +02:00
intents_controller.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
invites_controller.rb	…
manifests_controller.rb	…
media_controller.rb	…
media_proxy_controller.rb	…
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-18 18:04:49 +02:00
remote_unfollows_controller.rb	…
shares_controller.rb	…
statuses_controller.rb	Merge branch 'master' into glitch-soc/master	2018-08-21 18:24:48 +02:00
stream_entries_controller.rb	…
tags_controller.rb	…