diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-17 12:15:46 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-17 12:15:46 +0200 |
| commit | ca2a1d9f718a173a104fd08916ccbc6810d30e3b (patch) | |
| tree | e8c2da5569c0a02183c7194942d580e6a31614f4 /requirements.txt | |
| parent | 8fb2f3099e0a8e90fab1be3d9f7055581ffdf89a (diff) | |
| parent | 2401a5a5a156c3189e556d5dc6a2b4491942f48e (diff) | |
| download | Ishtar-ca2a1d9f718a173a104fd08916ccbc6810d30e3b.tar.bz2 Ishtar-ca2a1d9f718a173a104fd08916ccbc6810d30e3b.zip | |
Merge branch 'master' into develop
Conflicts:
ishtar_common/views.py
version.py
Diffstat (limited to 'requirements.txt')
0 files changed, 0 insertions, 0 deletions