Merge remote-tracking branch 'origin/master'
# Conflicts: # js/directives/fileselect.js
This commit is contained in:
commit
104b5870d5
|
@ -23,7 +23,7 @@
|
||||||
<script src="js/libs/jquery-2.2.4.min.js"></script>
|
<script src="js/libs/jquery-2.2.4.min.js"></script>
|
||||||
<script src="js/libs/lodash-4.17.3.min.js"></script>
|
<script src="js/libs/lodash-4.17.3.min.js"></script>
|
||||||
|
|
||||||
<script src="js/libs/angular.min.js"></script>
|
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.5/angular.js"></script>
|
||||||
|
|
||||||
<script src="js/libs/angularui-bootstrap-tpls.min.js"></script>
|
<script src="js/libs/angularui-bootstrap-tpls.min.js"></script>
|
||||||
<script src="js/libs/bootstrap-filestyle.js"></script>
|
<script src="js/libs/bootstrap-filestyle.js"></script>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user