Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		2018-10-05 15:23:57 +02:00
..
about	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
accounts	Refactor active_nav_class for use with multiple paths (#8757)	2018-09-23 20:42:13 +02:00
admin	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +02:00
admin_mailer
application
auth	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
authorize_interactions
errors
filters	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
follower_accounts
following_accounts
home
invites	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
kaminari
layouts	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
media
notification_mailer
oauth
remote_follow
remote_interaction
remote_unfollows
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
shared
shares
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
tags
user_mailer
well_known