Merge remote-tracking branch 'remotes/origin/master' into AD-661-due-1208-implement-jury-rating-an

Browse Source

Conflicts:
	ownership/test/test_api.py
	piece/models.py

...

This commit is contained in:

diminator 2015-08-24 12:20:54 +02:00

parent 411b7cb010

commit b76c752966

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files