summaryrefslogtreecommitdiff
path: root/archaeological_operations/admin.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2014-05-26 15:21:54 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2014-05-26 15:21:54 +0200
commit88fda31e98c367acb46ececfffb5105763506d88 (patch)
tree0c63372a171b2da2a1223ff609e691735d4fdd31 /archaeological_operations/admin.py
parentcd39cd6a351c9e25b65938e95cb5129ca463a9a2 (diff)
parent7b43d9761a89ba469334ce36f3260e40378faaeb (diff)
downloadIshtar-88fda31e98c367acb46ececfffb5105763506d88.tar.bz2
Ishtar-88fda31e98c367acb46ececfffb5105763506d88.zip
Merge branch 'newstyle'
Conflicts: ishtar_common/static/media/style.css
Diffstat (limited to 'archaeological_operations/admin.py')
0 files changed, 0 insertions, 0 deletions