Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' of github.com:wger-project/wger
Roland Geiderf630bae236fc
diff --cc wger/core/templates/template.htmlindex 21054cfe6,14573f136..ad4660d48--- a/wger/core/templates/template.html+++ b/wger/core/templates/template.html@@@ -61,10 -61,10 +61,9 @@@<script src="{% static 'bower_components/jquery/dist/jquery.js' %}"></script><script src="{% static 'js/jquery-ui.js' %}"></script><script src="{% static 'bower_components/d3/d3.js' %}"></script>- <script src="{% static 'js/workout-manager.js' %}"></script>+ <script src="{% static 'js/wger-core.js' %}"></script>- <script src="{% static 'js/ubuntu-unity.js' %}"></script><script src="{% static 'bower_components/bootstrap/dist/js/bootstrap.min.js' %}"></script><script src="{% static 'js/exercises.js' %}"></script>- <script src="{% static 'js/weight.js' %}"></script><script src="{% static 'js/nutrition.js' %}"></script>{% endcompress %}