diff options
| author | kali <kali@leap.se> | 2012-09-20 03:15:13 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-09-20 03:15:13 +0900 |
| commit | db704eecf513fcc48365844523557d6edab28293 (patch) | |
| tree | f37516c86c5d77f23f7e57d80ee4c39b3b651c3e /src/leap/__init__.py | |
| parent | add7973b3d1633b2776cb90f237415c6cac65d99 (diff) | |
| parent | 50396fca082652dd1a1617e0d029c1c726e4c651 (diff) | |
Merge branch 'develop' into feature/systray-menu
Conflicts:
src/leap/app.py
Diffstat (limited to 'src/leap/__init__.py')
| -rw-r--r-- | src/leap/__init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/leap/__init__.py b/src/leap/__init__.py index 75bddd6d..5e003931 100644 --- a/src/leap/__init__.py +++ b/src/leap/__init__.py @@ -28,3 +28,8 @@ except ImportError: pass __full_version__ = __appname__ + '/' + str(__version__) + +try: + from leap._branding import BRANDING as __branding +except ImportError: + __branding = {} |