Glitch-Shrike/app/views
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 Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
accounts Merge remote-tracking branch 'origin/master' into merge-upstream 2018-05-18 08:47:10 -05:00
admin Merge branch 'master' into glitch-soc/merge 2018-05-14 20:51:50 +02:00
admin_mailer
application
auth
authorize_follows
errors
follower_accounts Add preference to hide following/followers lists (#7532) 2018-05-18 02:26:51 +02:00
following_accounts Add preference to hide following/followers lists (#7532) 2018-05-18 02:26:51 +02:00
home
invites
kaminari
layouts Merge branch 'master' into glitch-soc/merge-upstream 2018-05-19 22:41:10 +02:00
media
notification_mailer
oauth
remote_follow Disables autocorrect/autocapitalize on remote username field. (#7549) 2018-05-19 19:36:23 +02:00
remote_unfollows
settings Merge remote-tracking branch 'origin/master' into merge-upstream 2018-05-18 08:47:10 -05: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/merge 2018-05-11 18:12:42 +02:00
user_mailer
well_known