Emanuel Schuetze 13cd52bd96 Merged (conflicts).		2013-01-05 15:29:57 +01:00
..
base_config.html	Updated config template.	2012-09-10 17:40:41 +02:00
general.html	Merged (conflicts).	2013-01-05 15:29:57 +01:00
version.html	Updated config template.	2012-09-10 17:40:41 +02:00