Skip to content
Commit c02ef800 authored by iNPUTmice's avatar iNPUTmice
Browse files

Merge branch 'master' of github.com:siacs/Conversations 

Conflicts:
	src/eu/siacs/conversations/crypto/PgpEngine.java
	src/eu/siacs/conversations/persistance/FileBackend.java
	src/eu/siacs/conversations/ui/ShareWithActivity.java
parents facb1242 0f4ba610
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment