Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml		2018-05-19 22:41:10 +02:00
..
about	…
accounts	…
admin	…
admin_mailer	…
application	…
auth	…
authorize_follows	…
errors	…
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	…
media	…
notification_mailer	…
oauth	…
remote_follow	…
remote_unfollows	…
settings	…
shared	…
shares	…
stream_entries	…
tags	…
user_mailer	…
well_known	…