Ossi Salmi 49a8ae3004 Merge branch 'puppet3' ... Conflicts: ntpd/templates/ntp.conf.erb wiki/templates/collab-wsgi.conf.erb		2013-05-24 10:10:57 +03:00
..
collab-httpd.conf.erb	Updated all templates to use instance variables	2013-05-05 00:07:55 +03:00
collab-wsgi.conf.erb	Merge branch 'puppet3'	2013-05-24 10:10:57 +03:00
collab.ini.erb	Updated all templates to use instance variables	2013-05-05 00:07:55 +03:00