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

f6e3f7f4

Unverified Commit f6e3f7f4 authored 6 years ago by Hubert Chathi Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'master' into dbkr/pk_private_export_import

parents e521ee84 173339ae

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

android/olm-sdk/src/main/jni/olm_pk.cpp 39 additions, 16 deletions

android/olm-sdk/src/main/jni/olm_pk.cpp
include/olm/pk.h 15 additions, 10 deletions

include/olm/pk.h
javascript/olm_pk.js 5 additions, 5 deletions

javascript/olm_pk.js
javascript/test/pk.spec.js 0 additions, 8 deletions

javascript/test/pk.spec.js
src/pk.cpp 43 additions, 15 deletions

src/pk.cpp

with 102 additions and 54 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