Merge branch 'chiaki_dev' into zemal_dev

* chiaki_dev:
  fix ci
  Add submission module

# Conflicts:
#	requirements.txt
This commit is contained in:
zemal
2017-05-09 14:41:26 +08:00
19 changed files with 372 additions and 2 deletions

View File

@@ -11,3 +11,5 @@ celery
Envelopes
qrcode
flake8-coding
requests
django-redis