Merge branch 'master' into homework
Showing
- .circleci/config.yml 31 additions, 0 deletions.circleci/config.yml
- README.md 2 additions, 0 deletionsREADME.md
- requirements/base.in 3 additions, 2 deletionsrequirements/base.in
- requirements/development.in 2 additions, 1 deletionrequirements/development.in
- requirements/development.txt 20 additions, 7 deletionsrequirements/development.txt
- requirements/production.in 2 additions, 0 deletionsrequirements/production.in
- requirements/production.txt 25 additions, 0 deletionsrequirements/production.txt
- src/account/admin.py 2 additions, 0 deletionssrc/account/admin.py
- src/account/auth_pipeline.py 11 additions, 0 deletionssrc/account/auth_pipeline.py
- src/account/migrations/0011_deadline.py 25 additions, 0 deletionssrc/account/migrations/0011_deadline.py
- src/account/migrations/0012_auto_20180125_1957.py 20 additions, 0 deletionssrc/account/migrations/0012_auto_20180125_1957.py
- src/account/migrations/0013_auto_20180203_2007.py 18 additions, 0 deletionssrc/account/migrations/0013_auto_20180203_2007.py
- src/account/migrations/0014_auto_20180203_2010.py 18 additions, 0 deletionssrc/account/migrations/0014_auto_20180203_2010.py
- src/account/migrations/0015_auto_20180203_2014.py 23 additions, 0 deletionssrc/account/migrations/0015_auto_20180203_2014.py
- src/account/migrations/0016_auto_20180203_2022.py 23 additions, 0 deletionssrc/account/migrations/0016_auto_20180203_2022.py
- src/account/models.py 10 additions, 3 deletionssrc/account/models.py
- src/account/serializers.py 13 additions, 1 deletionsrc/account/serializers.py
- src/account/views.py 2 additions, 0 deletionssrc/account/views.py
- src/homework/admin.py 1 addition, 1 deletionsrc/homework/admin.py
- src/homework/migrations/0004_auto_20180125_1817.py 22 additions, 0 deletionssrc/homework/migrations/0004_auto_20180125_1817.py
Loading
Please register or sign in to comment