Robert Einsle 201c347fcc Merge branch 'feature/#3_accounting_dialog' into develop ... # Conflicts: # billard/models.py # billard/views.py		2017-03-09 20:52:12 +01:00
..
migrations	Merge branch 'feature/#3_accounting_dialog' into develop	2017-03-09 20:52:12 +01:00
static/billard	add version info in footer	2017-02-25 20:30:08 +01:00
templates	fix details on accounting dialog	2017-03-09 20:12:25 +01:00
templatetags	update calculating prize for accounting	2017-03-02 20:51:43 +01:00
__init__.py	Added billard app	2017-01-03 19:27:04 +01:00
admin.py	updating admin	2017-03-02 21:01:07 +01:00
apps.py	Added billard app	2017-01-03 19:27:04 +01:00
models.py	Merge branch 'feature/#3_accounting_dialog' into develop	2017-03-09 20:52:12 +01:00
serializers.py	move to explicit imports	2017-03-06 18:54:03 +01:00
tasks.py	updated code for shared_tasks	2017-03-09 20:08:35 +01:00
tests.py	Added billard app	2017-01-03 19:27:04 +01:00
urls.py	updated modal code	2017-03-06 20:05:53 +01:00
utils.py	update calculating prize for accounting	2017-03-02 20:51:43 +01:00
views.py	Merge branch 'feature/#3_accounting_dialog' into develop	2017-03-09 20:52:12 +01:00