summaryrefslogtreecommitdiff
path: root/src/leap/common/config/pluggableconfig.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-04-02 10:48:41 -0300
committerTomás Touceda <chiiph@leap.se>2013-04-02 10:48:41 -0300
commit138def37372c44815ebc6e8cdb117e1158044d8e (patch)
treee6085b25f0372ed20b0112420ddb0a26b5d34d92 /src/leap/common/config/pluggableconfig.py
parent20c2b8986df3451d9d1f9e45a266731805f564b6 (diff)
parent9b5a6961a5662edf11ecee36caa5accbbda0281d (diff)
Merge remote-tracking branch 'drebs/feature/events-signals' into develop
Conflicts: .gitignore src/leap/common/__init__.py
Diffstat (limited to 'src/leap/common/config/pluggableconfig.py')
0 files changed, 0 insertions, 0 deletions