Revision 6b4f9fb2
ID | 6b4f9fb2d88f79a37c29ca568bb2ade91f6a8fd3 |
Merge branch 'use-django-user-model'
Conflicts:
astakos/middleware/auth.py
Files
- added
- modified
- copied
- renamed
- deleted
ID | 6b4f9fb2d88f79a37c29ca568bb2ade91f6a8fd3 |
Added by Sofia Papagiannaki about 12 years ago
Merge branch 'use-django-user-model'
Conflicts:
astakos/middleware/auth.py