Commit 2f1be78a162432e79f4c661b9e38e6371fdd575a
Exists in
master
Resolved merging conflicts in fields.py and test_models.py
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
Showing 13 changed files Inline Diff
- flashcards/fields.py
- flashcards/fixtures/sections.json
- flashcards/management/commands/importsections.py
- flashcards/migrations/0006_auto_20150511_2202.py
- flashcards/migrations/0006_auto_20150512_0042.py
- flashcards/migrations/0007_userflashcard_mask.py
- flashcards/migrations/0008_section_department_abbreviation.py
- flashcards/migrations/0009_auto_20150512_0318.py
- flashcards/models.py
- flashcards/tests/test_models.py
- flashcards/views.py
- flashy/settings.py
- schedule_scraper/scraper.py