luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-02 03:23:43 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/controllers/auth
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
..
confirmations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
omniauth_callbacks_controller.rb
passwords_controller.rb
registrations_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-30 17:52:08 +01:00