luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-03 12:03:57 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/settings
History
Thibaut Girka 6c233a04a0 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.
2018-09-03 14:33:06 +02:00
..
exports
two_factor_authentication
applications_controller.rb
base_controller.rb
deletes_controller.rb
exports_controller.rb
flavours_controller.rb
follower_domains_controller.rb
imports_controller.rb
migrations_controller.rb
notifications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-09-03 14:33:06 +02:00
preferences_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-09-03 14:33:06 +02:00
profiles_controller.rb
sessions_controller.rb
two_factor_authentications_controller.rb