| Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
ishtar_common/locale/fr/LC_MESSAGES/django.po
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
ishtar_common/locale/fr/LC_MESSAGES/django.po
|
|
|
|
Conflicts:
ishtar_common/locale/fr/LC_MESSAGES/django.po
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
ishtar_common/data_importer.py
|
|
|
|
|
|
|
|
|
|
|
|
- fix type import for ishtar_common
|
|
Conflicts:
ishtar_common/data_importer.py
|
|
|
|
|
|
To apply:
./manage.py migrate ishtar_common --delete-ghost-migrations 0029
./manage.py migrate ishtar_common --fake 0030
|
|
|
|
|
|
|
|
|
|
|