diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-07-10 21:54:31 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-07-10 21:54:31 +0200 |
| commit | 3dfd406cd0f137e08d991479bd9de71e7686461a (patch) | |
| tree | 23dedcb8264d623308e2463c50c682a7216929a9 /ishtar_common/urls.py | |
| parent | 75f1b7231e3301f889665ba9e0928b31060b7264 (diff) | |
| parent | a69028c181e43deb86766019a100c5dcd0814502 (diff) | |
| download | Ishtar-3dfd406cd0f137e08d991479bd9de71e7686461a.tar.bz2 Ishtar-3dfd406cd0f137e08d991479bd9de71e7686461a.zip | |
Merge branch 'stable'
Conflicts:
ishtar_common/templates/ishtar/wizard/parcels_wizard.html
Diffstat (limited to 'ishtar_common/urls.py')
0 files changed, 0 insertions, 0 deletions