Roland Geider 34f2949415 Merge branch 'master' into feature/routine-generator ...

Conflicts:
	.gitignore
	wger/__init__.py
	wger/core/forms.py
	wger/core/management/commands/clear-cache.py
	wger/core/models.py
	wger/core/templates/base.html
	wger/core/templates/mobile/navigation.html
	wger/core/templates/navigation.html
	wger/core/tests/test_preferences.py
	wger/exercises/templates/exercise/view.html
	wger/manager/fixtures/test-user-data.json
	wger/manager/models.py
	wger/manager/pdf.py
	wger/manager/templates/mobile/schedule/view.html
	wger/manager/templates/mobile/tags/render_day.html
	wger/manager/templates/schedule/view.html
	wger/manager/tests/test_schedule.py
	wger/manager/urls.py
	wger/manager/views/schedule.py
	wger/software/templates/changelog.html
	wger/utils/pdf.py
	wger/utils/tests/test_unit_conversion.py
	wger/utils/units.py

2014-12-23 15:08:09 +01:00

..

bench

Update funkload benchmark

2013-07-08 23:42:53 +02:00

scripts

Merge branch 'master' into feature/routine-generator

2014-12-23 15:08:09 +01:00