diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-01-04 13:42:41 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-01-04 13:42:41 +0100 |
| commit | 7010793c95ba521dc41b3fcdc45577f0242603f1 (patch) | |
| tree | 7b64b66e1dfa7d72ae5289dc194a720ac022b780 /ishtar/furnitures/forms.py | |
| parent | 74ddd12c14e4f19b84db796780919516a76e414c (diff) | |
| parent | b3972516226e942cc1d92e7a36275b9433cda3f6 (diff) | |
| download | Ishtar-7010793c95ba521dc41b3fcdc45577f0242603f1.tar.bz2 Ishtar-7010793c95ba521dc41b3fcdc45577f0242603f1.zip | |
Merge branch 'master' of lysithea.proxience.com:/home/proxience/git/ishtar
Conflicts:
ishtar/furnitures/forms.py
Diffstat (limited to 'ishtar/furnitures/forms.py')
0 files changed, 0 insertions, 0 deletions