Merge remote-tracking branch 'origin/master'

# Conflicts: # js/directives/fileselect.js
2017-07-29 20:57:12 +02:00 · 2017-07-29 20:57:12 +02:00 · 104b5870d5
commit 104b5870d5
parent 83ba82d4bc ace00309d3
1 changed files with 1 additions and 1 deletions
--- a/index.html
+++ b/index.html
@ -23,7 +23,7 @@
  <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/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/bootstrap-filestyle.js"></script>