diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2014-10-22 12:31:19 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2014-10-22 12:31:19 +0200 |
| commit | d1a72dccc475515a342e9f5ef8f53c343ac35ea0 (patch) | |
| tree | 1f9a6b5a8261502f699927994c308a67369ff11f /example_project/settings.py | |
| parent | 96e3b8118b8af93028d77dad79b856d98567d354 (diff) | |
| parent | b767774f85e5b0a9b32e58c9feba4ec8c9dc0498 (diff) | |
| download | Ishtar-d1a72dccc475515a342e9f5ef8f53c343ac35ea0.tar.bz2 Ishtar-d1a72dccc475515a342e9f5ef8f53c343ac35ea0.zip | |
Merge branch 'decoupage'
Conflicts:
archaeological_operations/admin.py
archaeological_operations/models.py
Diffstat (limited to 'example_project/settings.py')
0 files changed, 0 insertions, 0 deletions