summaryrefslogtreecommitdiff
path: root/ishtar_common/admin.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-06-30 19:53:43 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-06-30 19:53:43 +0200
commitb2624576250b1b42d5473063db7e8305dfe6a485 (patch)
tree6b957c6b69a08f926300b70c6b2f4251e1acf3cd /ishtar_common/admin.py
parent470f30044999edafc5d9b2c9adab7e1eb6fd49d1 (diff)
parentef1ad8b6bed863b4a5285d7c35b684917510ef56 (diff)
downloadIshtar-b2624576250b1b42d5473063db7e8305dfe6a485.tar.bz2
Ishtar-b2624576250b1b42d5473063db7e8305dfe6a485.zip
Merge branch 'master' into develop
Diffstat (limited to 'ishtar_common/admin.py')
0 files changed, 0 insertions, 0 deletions