Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge
Roland Geiderfc2b8dc75b48
diff --cc wger/__init__.pyindex a51e1f5b7,c78df6851..29eae31ba--- a/wger/__init__.py+++ b/wger/__init__.py@@@ -5,8 -5,8 +5,13 @@@:license: GNU GPL, see LICENSE for more details."""++<<<<<<< local+VERSION = (1, 3, 0, 'final', 1)+RELEASE = True++=======+ VERSION = (1, 4, 0, 'alpha', 1)+ RELEASE = False++>>>>>>> otherdef get_version(version=None, release=None):diff --cc wger/software/templates/changelog.htmlindex 2f3c38c57,6a644a121..a6c7efdbe--- a/wger/software/templates/changelog.html+++ b/wger/software/templates/changelog.html@@@ -7,8 -7,16 +7,16 @@@{% block title %}{% trans "Changelog" %}{% endblock %}{% block content %}+ <h3>1.4</h3>+ <h4>2013-XX-XX</h4>++ <ul>+ <li><li>+ </ul>++<h3>1.3</h3>-<h4>2013-XX-XX</h4>+<h4>2013-11-27</h4><ul><li>New translations