summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-02-26 20:53:46 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-02-26 20:53:46 +0100
commitd4f4f013cb10baba623bb0de1620691de47286b2 (patch)
tree67b266e8fef5fc1da56358c5cc4c892c7c53ead4
parentf72f7d90893b4f4ae0e000563b7c20faeefc8f18 (diff)
downloadIshtar-d4f4f013cb10baba623bb0de1620691de47286b2.tar.bz2
Ishtar-d4f4f013cb10baba623bb0de1620691de47286b2.zip
Fix migrations merge
-rw-r--r--ishtar_common/migrations/0003_auto__add_ishtarsiteprofile.py (renamed from ishtar_common/migrations/0048_auto__add_ishtarsiteprofile.py)0
1 files changed, 0 insertions, 0 deletions
diff --git a/ishtar_common/migrations/0048_auto__add_ishtarsiteprofile.py b/ishtar_common/migrations/0003_auto__add_ishtarsiteprofile.py
index 5a2c21bf1..5a2c21bf1 100644
--- a/ishtar_common/migrations/0048_auto__add_ishtarsiteprofile.py
+++ b/ishtar_common/migrations/0003_auto__add_ishtarsiteprofile.py