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
..
files	Added variable collab_webroot for changing collab path in apache config	2012-12-13 19:28:54 +02:00
manifests	wiki::collab: Added optional support for WSGI daemon mode	2013-04-16 15:37:50 +03:00
templates	Merge branch 'puppet3'	2013-05-24 10:10:57 +03:00
Makefile	Updated Moin version to 1.9.6 in wiki/Makefile	2013-02-07 14:05:39 +02:00