André Peters 432246b3ca Merge branch 'master' into dev		2017-01-29 22:26:06 +01:00
..
Dockerfiles	Merge branch 'master' into dev	2017-01-29 22:26:06 +01:00
assets	Generate safe passwords	2016-12-28 11:36:15 +01:00
conf	Fix settings	2017-01-29 13:56:24 +01:00
web	Fix resource translation	2017-01-29 22:07:13 +01:00