Merge branch 'U4-5512' of https://github.com/arknu/Umbraco-CMS into arknu-U4-5512

Conflicts: src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
2014-10-03 13:01:00 +10:00
parent 8cfb5915ac
commit c078a1c12f
5 changed files with 203 additions and 3 deletions
--- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
+++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js
@@ -11,6 +11,8 @@

    'lib/angular/angular-ui-sortable.js',

+    'lib/angular/tmhDynamicLocale.js',
+
    'lib/jquery/jquery.upload/js/jquery.fileupload.js',
    'lib/jquery/jquery.upload/js/load-image.min.js',
    'lib/jquery/jquery.upload/js/jquery.fileupload-process.js',