diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-05-20 00:35:51 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-20 00:35:51 +0200 |
| commit | e43af859f710814f462001bcde5157a4594c59b7 (patch) | |
| tree | 63f4fab584f0cc4e4b38f19461800b532af98195 /ishtar_common/menus.py | |
| parent | 74d607f46c0138a08d47a19385f573f818f8a5f6 (diff) | |
| parent | c435e9230b0291924887460bac3fa8f3576dcf43 (diff) | |
| download | Ishtar-e43af859f710814f462001bcde5157a4594c59b7.tar.bz2 Ishtar-e43af859f710814f462001bcde5157a4594c59b7.zip | |
Merge branch 'stable'
Conflicts:
ishtar_common/locale/fr/LC_MESSAGES/django.po
Diffstat (limited to 'ishtar_common/menus.py')
0 files changed, 0 insertions, 0 deletions