Merge remote-tracking branch 'origin/dev-v7' into dev-v7-contenttypeeditor

Conflicts: src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs src/Umbraco.Web.UI.Client/bower.json src/Umbraco.Web.UI.Client/gruntFile.js src/Umbraco.Web.UI.Client/src/less/property-editors.less
2015-06-25 10:16:35 +02:00
parent 9c8489c4c5 a85f3bfc16
commit fc7932c2bf
199 changed files with 1345 additions and 28267 deletions
--- a/src/Umbraco.Web.UI.Client/bower.json
+++ b/src/Umbraco.Web.UI.Client/bower.json
@@ -26,6 +26,7 @@
        "angular-dynamic-locale": "~0.1.27",
        "ng-file-upload": "~3.0.2",
        "tinymce": "~4.1.10",
-        "bootstrap-tabdrop": "~1.0.0"
+    "bootstrap-tabdrop": "~1.0.0",
+    "codemirror": "~5.3.0"
    }
 }