smile/cbmi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into hotfix/0.2.13

Browse source
This commit is contained in:
baccenfutter 2013-11-23 20:50:37 +01:00
commit b73b7d3d61
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
account/templates/base.html
View file

@ -140,7 +140,7 @@
</div> </div>
</div><!-- /.container --> </div><!-- /.container -->
{% endblock body %} {% endblock body %}
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script> <script src="/static/js/jquery.min.js"></script>
<script src="/static/c-base-bootstrap/js/bootstrap.js"></script> <script src="/static/c-base-bootstrap/js/bootstrap.js"></script>
<script src="/static/c-base-bootstrap/js/bootstrap-transitions.js"></script> <script src="/static/c-base-bootstrap/js/bootstrap-transitions.js"></script>
<script src="/static/c-base-bootstrap/js/bootstrap-dropdown.js"></script> <script src="/static/c-base-bootstrap/js/bootstrap-dropdown.js"></script>

6
static/js/jquery.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long