Skip to content
Snippets Groups Projects
Commit f033f4fa authored by Ernir Erlingsson's avatar Ernir Erlingsson
Browse files

Merge branch '40-forgotten-password' of... 

Merge branch '40-forgotten-password' of https://code.briarproject.org/akwizgran/briar into 40-forgotten-password

Conflicts:
	briar-android/res/values/strings.xml
	briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java
parents b33d8d1e 0fe51460
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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