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

Browse Source

Conflicts:
	briar-android/res/values/strings.xml
	briar-tests/src/org/briarproject/plugins/file/RemovableDrivePluginTest.java

...

This commit is contained in:

Ernir Erlingsson

2015-12-10 11:12:10 +01:00

parent b33d8d1ee5 0fe514606f

commit f033f4fae0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available