mastodon/app/views
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
..
about Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
accounts
admin Merge branch 'master' into glitch-soc/merge-upstream 2019-02-19 20:18:40 +01:00
admin_mailer
application
auth
authorize_interactions
directories
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
media
notification_mailer
oauth
public_timelines Redesign landing page (#10232) 2019-03-12 17:34:00 +01:00
remote_follow Fix remote interaction dialogs being indexed by search engines (#10240) 2019-03-11 20:47:50 +01:00
remote_interaction Fix remote interaction dialogs being indexed by search engines (#10240) 2019-03-11 20:47:50 +01:00
remote_unfollows
settings
shared
shares
stream_entries Merge branch 'master' into glitch-soc/merge-upstream 2019-03-08 00:57:13 +01:00
tags Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
user_mailer
well_known