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