David Yip 1b8fcd4df5 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml		2018-03-02 21:46:44 -06:00
..
confirmations_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-02-04 16:36:19 -06:00
omniauth_callbacks_controller.rb	CAS + SAML authentication feature (#6425)	2018-02-04 05:42:13 +01:00
passwords_controller.rb	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
registrations_controller.rb	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2018-02-02 08:39:52 -06:00
sessions_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00