diff options
| author | kali <kali@leap.se> | 2012-10-02 05:31:47 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-10-02 05:31:47 +0900 |
| commit | b81337d8a183bffe32ebf512c49a6af07fc7622e (patch) | |
| tree | 0352010716fcc0118eab6c0d6c9e5e543c8b150f /data/resources | |
| parent | f56e89199c063ea76a901ae187933c7604b4858b (diff) | |
| parent | abf481cab381a86d8a9c5607a131b56636081382 (diff) | |
Merge branch 'feature/json-validation' into develop
Conflicts:
src/leap/eip/config.py
src/leap/eip/specs.py
Diffstat (limited to 'data/resources')
0 files changed, 0 insertions, 0 deletions