tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
762e4fdf557ff7cbdd9fce301060f11bb23cb84e
Mastodon/app/controllers/auth/sessions_controller.rb
Thibaut Girka 1c448d6474 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/auth/sessions_controller.rb

Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
2018-10-30 17:52:08 +01:00

3.2 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink