Michael Kuron 08612f0aef Merge remote-tracking branch 'origin/dev' into forwardinghosts		2017-04-22 18:13:58 +02:00
..
Dockerfiles	Merge remote-tracking branch 'origin/dev' into forwardinghosts	2017-04-22 18:13:58 +02:00
assets	Generate safe passwords	2016-12-28 11:36:15 +01:00
conf	Merge remote-tracking branch 'origin/dev' into forwardinghosts	2017-04-22 18:13:58 +02:00
web	Merge remote-tracking branch 'origin/dev' into forwardinghosts	2017-04-22 18:13:58 +02:00