Commit Graph
3 Commits
Author SHA1 Message Date
Alexander Werner 46c9cdb2d5 Merge branch 'develop' of git.einsle.de:carom/carom-server into develop
Conflicts:
	billard/models.py
2017-02-06 20:28:26 +01:00
Alexander Werner d0e5b90946 fixed typo in models 2017-02-06 20:27:11 +01:00
Alexander Werner 567d6007fe Added metadata to models 2017-02-06 19:19:28 +01:00