diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-27 14:47:34 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-27 14:47:34 -0300 |
| commit | 0c9e8abab36c2a8c53bb4a77ffd5bd4cf654bb87 (patch) | |
| tree | 3e8879e2685434840e7fb9019b518e863c61031b /server/setup.py | |
| parent | f3cafe7559f6d8ed030ec41e084f5f8d9190f2ea (diff) | |
| parent | fca7b95787fa63e58929458470c93351bee6a2cb (diff) | |
Merge remote-tracking branch 'kali/hotfix/add_manifest_license' into develop
Diffstat (limited to 'server/setup.py')
0 files changed, 0 insertions, 0 deletions