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

Merge branch 'feature/file_transfer' into development 

Conflicts:
	src/main/res/values/strings.xml
parents 07b07115 41f7848f
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