mastodon/app/views
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
..
about Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
accounts Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
admin Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
admin_mailer
application
auth
authorize_follows
errors
follower_accounts
following_accounts
home
invites
kaminari
layouts
media
notification_mailer
oauth
remote_follow
remote_unfollows
settings Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
shared
shares
stream_entries Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
tags Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
user_mailer
well_known