mastodon/app/controllers
Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
2019-03-13 15:16:02 +01:00
..
activitypub
admin Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
api Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
auth Merge branch 'master' into glitch-soc/merge-upstream 2019-02-15 18:02:45 +01:00
concerns Improvements to signature verification (#9667) 2019-01-07 21:45:13 +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-11 11:23:50 +01:00
well_known
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-13 15:16:02 +01:00
application_controller.rb
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
following_accounts_controller.rb
home_controller.rb
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb
media_proxy_controller.rb
public_timelines_controller.rb Redesign landing page (#10232) 2019-03-12 17:34:00 +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-02-28 21:35:53 +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