Commit Graph

3 Commits

Author SHA1 Message Date
TimGeyssens 7ef4ea4e56 Merge branch 'v7-upgrade-test' of https://github.com/umbraco/OurUmbraco into v7-upgrade-test
Conflicts:
	OurUmbraco.Site/Assets/css/style.min.css
2015-02-25 15:22:39 +01:00
Sebastiaan Janssen 79a3165b9e Fixes versioncompatibility 2014-09-14 13:55:42 +02:00
Sebastiaan Janssen 810cbd267f Initial commit 2012-12-17 09:41:11 +01:00