Merge branch 'master' of https://github.com/ksjdragon/hourglass

2016-10-22 17:23:24 -04:00 · 2016-10-22 17:23:24 -04:00 · d7dcf0be86
commit d7dcf0be86
parent 18c172c088 5baf08543f
2 changed files with 8 additions and 0 deletions
--- a/hourglass/packages/meteor-admin-lte/admin-lte.html
+++ b/hourglass/packages/meteor-admin-lte/admin-lte.html
@ -1,5 +1,6 @@
 <template name="AdminLTE">
  <link rel="stylesheet" type="text/css" href="/bootstrap/bootstrap.min.css">
+  <script type="text/javascript" src="/bootstrap/bootstrap.min.js"></script>
  {{#unless isReady}}
    {{> Template.dynamic template=loadingTemplate}}
  {{else}}
--- a/hourglass/public/bootstrap/bootstrap.min.js
+++ b/hourglass/public/bootstrap/bootstrap.min.js