Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

Olm
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

853ea8fb

Commit 853ea8fb authored 7 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'master'

Merge master into patched branch to fix conflicts prior to merge back to master

parents 1225de14 51840d82

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

python/.gdb_history 225 additions, 0 deletions

python/.gdb_history
python/olm/__main__.py 83 additions, 42 deletions

python/olm/__main__.py
python/olm/_base.py 1 addition, 0 deletions

python/olm/_base.py
python/olm/account.py 3 additions, 0 deletions

python/olm/account.py
python/olm/inbound_group_session.py 22 additions, 10 deletions

python/olm/inbound_group_session.py
python/olm/outbound_group_session.py 40 additions, 14 deletions

python/olm/outbound_group_session.py
python/olm/session.py 15 additions, 6 deletions

python/olm/session.py

with 389 additions and 72 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment