Dominique Roux 1d11dfabaa Merge remote-tracking branch 'origin/feature/set_favicon' into develop		2015-09-20 20:19:34 +02:00
..
about.html	Merge branch 'master' of git-ungleich:dynamicweb	2015-09-16 01:31:17 -06:00
base.html	Merge remote-tracking branch 'origin/feature/set_favicon' into develop	2015-09-20 20:19:34 +02:00
contact.html	removed conflict on digitalglarus/contact.html	2015-09-19 08:25:34 -06:00
detail.html	digital_glarus -> digitalglarus	2015-06-10 23:34:33 +02:00
index.html	Merge branch 'master' of git.ungleich.ch:dynamicweb	2015-09-16 09:58:05 +02:00
letscowork.html	Spell error	2015-09-20 19:31:27 +02:00