Manuel Friedli 057d2a51a8 Merge branch 'develop' into feature/updatecharsetmetatag ... Conflicts: index.html info/index.html		2015-01-15 17:20:32 +01:00
..
index.html	Merge branch 'develop' into feature/updatecharsetmetatag	2015-01-15 17:20:32 +01:00
info.css	reformatted the whole code base	2014-08-26 17:49:23 +02:00