andryyy aa5b03dd99 Merge branch 'dev' ... Conflicts: data/web/autodiscover.php		2017-06-28 18:57:22 +02:00
..
Dockerfiles	Use , as IFS for additional san	2017-06-28 10:50:51 +02:00
assets	Properly gitignore the SSL certificate	2017-06-15 10:20:54 +02:00
conf	Remove old code	2017-06-26 23:17:46 +02:00
web	Merge branch 'dev'	2017-06-28 18:57:22 +02:00