Skip to content
Snippets Groups Projects
Forked from briar / briar
Source project has a limited visibility.
user avatar
Ernir Erlingsson authored
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
f033f4fa
History
Name Last commit Last update