Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into rep-options
Roland Geiderfe802bae3ab9
diff --cc tasks.pyindex 4a33bc362,7a9cd86e7..cb2dc868b--- a/tasks.py+++ b/tasks.py@@@ -251,11 -242,9 +242,11 @@@ def load_fixtures(settings_path=None)call_command("loaddata", path + "users.json")call_command("loaddata", path + "licenses.json")call_command("loaddata", path + "days_of_week.json")+ call_command("loaddata", path + "setting_repetition_units.json")+ call_command("loaddata", path + "setting_weight_units.json")# Config- path = os.path.join(current_dir, 'config', 'fixtures/')+ path = os.path.join(current_dir, 'wger', 'config', 'fixtures/')call_command("loaddata", path + "language_config.json")call_command("loaddata", path + "gym_config.json")