diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-17 21:09:09 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-17 21:09:09 +0100 |
| commit | ad3ebfed01a7bb3844349b6c00e64377bde4055b (patch) | |
| tree | 121a4e7a25b8302fa4412a6066565f86dfd4733f /setup.py | |
| parent | e2a45e2db75ec6960d458ea08004becaf429d2f6 (diff) | |
| parent | c37bb6ecce45fccc1f0c9d321a785ffeeefc3366 (diff) | |
| download | Ishtar-ad3ebfed01a7bb3844349b6c00e64377bde4055b.tar.bz2 Ishtar-ad3ebfed01a7bb3844349b6c00e64377bde4055b.zip | |
Merge branch 'master' into v0.9
Conflicts:
ishtar_common/migrations/0030_auto__add_state__chg_field_sourcetype_txt_idx__chg_field_authortype_tx.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions