Ivan Filippov 7c5814beed Merge branch 'master' into new_ui
- Fixed conflicts in login.html
- Fixed bug that would switch auth_method after the first failed login
attempt.
2016-04-29 12:26:10 -06:00
..
2016-04-29 12:26:10 -06:00
2015-12-13 16:34:12 +07:00