Norman Jäckel 68ec516e6f Merge pull request #1799 from emanuelschuetze/loginText ... Show info text in login form (Fixes #1754)		2016-01-09 16:07:55 +01:00
..
js/users	Merge pull request #1799 from emanuelschuetze/loginText	2016-01-09 16:07:55 +01:00
templates/users	Merge pull request #1785 from emanuelschuetze/fix-template-bugs	2016-01-09 01:12:51 +01:00