diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-04-02 10:48:41 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-04-02 10:48:41 -0300 |
commit | 138def37372c44815ebc6e8cdb117e1158044d8e (patch) | |
tree | e6085b25f0372ed20b0112420ddb0a26b5d34d92 /pkg/requirements.pip | |
parent | 20c2b8986df3451d9d1f9e45a266731805f564b6 (diff) | |
parent | 9b5a6961a5662edf11ecee36caa5accbbda0281d (diff) |
Merge remote-tracking branch 'drebs/feature/events-signals' into develop
Conflicts:
.gitignore
src/leap/common/__init__.py
Diffstat (limited to 'pkg/requirements.pip')
0 files changed, 0 insertions, 0 deletions