-
- Downloads
Merge branch 'master' into '1606875806-66'
# Conflicts: # core/models/accounts.py
Showing
- core/migrations/0019_auto_20191006_0906.py 25 additions, 0 deletionscore/migrations/0019_auto_20191006_0906.py
- core/migrations/0020_merge_20191006_1538.py 17 additions, 0 deletionscore/migrations/0020_merge_20191006_1538.py
- core/migrations/0021_merge_20191006_2031.py 16 additions, 0 deletionscore/migrations/0021_merge_20191006_2031.py
- core/migrations/0022_student_recommendations.py 20 additions, 0 deletionscore/migrations/0022_student_recommendations.py
- core/migrations/0032_merge_20191008_1655.py 17 additions, 0 deletionscore/migrations/0032_merge_20191008_1655.py
- core/models/accounts.py 1 addition, 0 deletionscore/models/accounts.py
- core/serializers/accounts.py 7 additions, 3 deletionscore/serializers/accounts.py
- core/tests/test_accounts.py 6 additions, 1 deletioncore/tests/test_accounts.py
- package-lock.json 358 additions, 351 deletionspackage-lock.json
Loading
Please register or sign in to comment