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 /src/leap/common/__init__.py | |
| 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 'src/leap/common/__init__.py')
| -rw-r--r-- | src/leap/common/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/common/__init__.py b/src/leap/common/__init__.py index 9467c46..5702ca1 100644 --- a/src/leap/common/__init__.py +++ b/src/leap/common/__init__.py @@ -3,6 +3,7 @@ import logging from leap.common import certs from leap.common import check from leap.common import files +from leap.common import events logger = logging.getLogger(__name__) @@ -13,6 +14,6 @@ except ImportError: logger.debug('PyGeoIP not found. Disabled Geo support.') HAS_GEOIP = False -__all__ = ["certs", "check", "files"] +__all__ = ["certs", "check", "files", "events"] __version__ = "0.2.0-dev" |