diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-04-24 12:35:17 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-04-24 12:35:17 +0100 |
| commit | 853ea8fbc7b393455c69de1ce95011117f1423fe (patch) | |
| tree | 155ef868e0927f227dd956674237489e0b6c9b01 /python/olm/_base.py | |
| parent | 1225de14d7aa5e53da51c7008046130996fdaca1 (diff) | |
| parent | 51840d82dc6799687873be9839b99738fcd931a6 (diff) | |
Merge branch 'master'
Merge master into patched branch to fix conflicts prior to merge back to master
Diffstat (limited to 'python/olm/_base.py')
| -rw-r--r-- | python/olm/_base.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/python/olm/_base.py b/python/olm/_base.py index 64cb98b..ad21d6f 100644 --- a/python/olm/_base.py +++ b/python/olm/_base.py @@ -12,5 +12,6 @@ lib.olm_error.restypes = c_size_t ERR = lib.olm_error() + class OlmError(Exception): pass |