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 | 2f44d6ba0a72fb952c7fc213fbefaa46fee39b7d (patch) | |
| tree | 1f9a6b5a8261502f699927994c308a67369ff11f /setup.py | |
| parent | 1ccc55cd446d9b2e63a8241915afafa566d82dbc (diff) | |
| parent | 00822b4f57c61d5563f1ae4a47640ab1c754843c (diff) | |
| download | Ishtar-2f44d6ba0a72fb952c7fc213fbefaa46fee39b7d.tar.bz2 Ishtar-2f44d6ba0a72fb952c7fc213fbefaa46fee39b7d.zip | |
Merge branch 'decoupage'
Conflicts:
archaeological_operations/admin.py
archaeological_operations/models.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions