mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-27 13:03:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/controllers/auth
History
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge 
Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
2018-07-09 07:13:59 +02:00
..
confirmations_controller.rb Fix confirmations_controller 2018-06-21 23:48:54 +02: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/tentative-merge 2018-07-09 07:13:59 +02:00
sessions_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-09 00:17:17 +00:00