summaryrefslogtreecommitdiff
path: root/templates/layout.html
diff options
context:
space:
mode:
authorFelix Favre <gnomus@gnomus.de>2014-08-24 16:55:26 +0200
committerFelix Favre <gnomus@gnomus.de>2014-08-24 16:55:26 +0200
commit20e66633a3440bb8390c22a627a6f76d07137174 (patch)
tree2a9b867167a33814ddaefc8f7c281551d00a9c4e /templates/layout.html
parent88dfb2e3a8d3c3ef5fb9007e72491baeb7f6373f (diff)
parent3da1748e841a24e4e462f5a8212362270d74cf0b (diff)
Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts: templates/layout.html
Diffstat (limited to 'templates/layout.html')
-rw-r--r--templates/layout.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/layout.html b/templates/layout.html
index 4b44acde..8697f69d 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -38,7 +38,7 @@
</div>
<script type="text/javascript" src="vendor/bootstrap-3.2.0/js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/forms.js"></script>
- <script type="text/javascript" src="js/moment-with-locales.min.js"></script>
+ <script type="text/javascript" src="vendor/moment-with-locales.min.js"></script>
<script type="text/javascript">
$(function() {
moment.locale("%locale%");