diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-02 01:18:08 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-02 01:18:08 +0200 |
| commit | aae1ff4d7807f7f733cc2257e967ede164fb857f (patch) | |
| tree | 295a06aba15c5fb6c38948930813a331ded4302c /ishtar_common/ishtar_menu.py | |
| parent | 47bbe25d1d5bf05e5413030e7f6393e248b4c361 (diff) | |
| parent | 83f15696544f7852ba741801dc3b80d929ca18e5 (diff) | |
| download | Ishtar-aae1ff4d7807f7f733cc2257e967ede164fb857f.tar.bz2 Ishtar-aae1ff4d7807f7f733cc2257e967ede164fb857f.zip | |
Merge branch 'stable'
Conflicts:
ishtar_common/locale/fr/LC_MESSAGES/django.po
Diffstat (limited to 'ishtar_common/ishtar_menu.py')
0 files changed, 0 insertions, 0 deletions