Merge branch 'master' into rs

This commit is contained in:
Stefan Midjich 2016-12-07 14:08:51 +01:00
commit 14f7302f7c
2 changed files with 6 additions and 1 deletions

5
static/js/jquery-1.12.2.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -77,7 +77,7 @@
<script>
var plugin_ttl = {{plugin_ttl}};
</script>
<script src="https://code.jquery.com/jquery-1.12.2.min.js"></script>
<script src="/static/js/jquery-1.12.2.min.js"></script>
<script src="/static/js/captiveportal.js"></script>
</body>