yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v7' into dev-v7-contenttypeeditor

Browse Source 
Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/app.dev.js
	src/Umbraco.Web.UI.Client/src/less/application/grid.less
	src/Umbraco.Web.UI.Client/src/less/panel.less
	src/Umbraco.Web.UI.Client/src/loader.js
	src/Umbraco.Web/Umbraco.Web.csproj
This commit is contained in:
Shannon
2015-06-23 18:27:18 +02:00
parent a53166828a 7503a83219
commit aad82360ad
320 changed files with 2958 additions and 6399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web/UI/JavaScript/JsInitialize.js
View File

@@ -15,6 +15,7 @@
'lib/ng-file-upload/angular-file-upload.min.js',
'lib/bootstrap/js/bootstrap.2.3.2.min.js',
'lib/bootstrap-tabdrop/bootstrap-tabdrop.js',
'lib/umbraco/Extensions.js',
'lib/umbraco/NamespaceManager.js',