Glitch-Shrike/app/views
David Yip e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/controllers/settings/preferences_controller.rb
 	app/lib/user_settings_decorator.rb
 	app/models/user.rb
 	config/locales/simple_form.en.yml
2018-05-18 08:47:10 -05:00
..
about
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 remote-tracking branch 'origin/master' into merge-upstream 2018-05-18 08:47:10 -05:00
media
notification_mailer
oauth
remote_follow
remote_unfollows
settings Merge remote-tracking branch 'origin/master' into merge-upstream 2018-05-18 08:47:10 -05:00
shared
shares
stream_entries
tags
user_mailer
well_known