Rasmus Werling 8b0d85528f Merge remote-tracking branch 'upstream/master' into basic-auth ... Conflicts: templates/vhosts-2.2.conf.j2 templates/vhosts.conf.j2		2016-05-04 10:53:51 +03:00
..
main.yml	Merge remote-tracking branch 'upstream/master' into basic-auth	2016-05-04 10:53:51 +03:00