luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-04 20:45:13 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/settings
History
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
2019-01-02 15:36:53 +01:00
..
exports Add CSV export for lists and domain blocks (#9677) 2019-01-01 13:44:04 +01:00
two_factor_authentication Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
applications_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
base_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
deletes_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
exports_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
flavours_controller.rb
follower_domains_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
imports_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
migrations_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
notifications_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00
preferences_controller.rb Add a per-user setting to hide followers count 2018-12-20 14:51:12 +01:00
profiles_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
two_factor_authentications_controller.rb Create Settings::BaseController (#9507) 2018-12-12 22:32:13 +01:00