Raul Ascencio 79b9929b1b Merge branch 'master' of git.ungleich.ch:dynamicweb ... Conflicts: digitalglarus/templates/digitalglarus/base.html digitalglarus/templates/digitalglarus/index.html		2015-09-16 09:58:05 +02:00
..
digitalglarus	Merge branch 'master' of git.ungleich.ch:dynamicweb	2015-09-16 09:58:05 +02:00