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

Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc 

Conflicts:
	src/main/AndroidManifest.xml
parents a054a3fb 696dd07a
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