Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…		2018-06-15 20:51:39 +02: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 branch 'master' into glitch-soc/merge-upstream	2018-06-15 20:51:39 +02:00
sessions_controller.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-09 00:17:17 +00:00