Merge remote-tracking branch 'origin/temp8' into temp8-3527-indexes-via-code
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
[
|
||||
'lib/jquery/jquery.min.js',
|
||||
'lib/jquery-ui/jquery-ui.min.js',
|
||||
'lib/jquery-ui-touch-punch/jquery.ui.touch-punch.js',
|
||||
'lib/jquery-ui-touch-punch/jquery.ui.touch-punch.min.js',
|
||||
|
||||
'lib/angular/angular.js',
|
||||
'lib/underscore/underscore-min.js',
|
||||
@@ -23,7 +23,6 @@
|
||||
'lib/ng-file-upload/ng-file-upload.min.js',
|
||||
'lib/angular-local-storage/angular-local-storage.min.js',
|
||||
|
||||
'lib/bootstrap/js/bootstrap.2.3.2.min.js',
|
||||
'lib/umbraco/Extensions.js',
|
||||
|
||||
'lib/umbraco/NamespaceManager.js',
|
||||
|
||||
Reference in New Issue
Block a user