akwizgran 81863b9db6 Merge branch '1248-rename-lock-app' into 'master' ...

Rename "Screen lock" to "Lock app"

Closes #1248 and #1245

See merge request briar/briar!924

2018-09-19 14:28:34 +00:00

..

androidTest/java/org/briarproject/briar/android

Take screenshot of Tor settings

2018-09-03 18:03:57 -03:00

debug/res/values

Move res values from build.gradle into strings.xml

2018-08-03 13:08:18 -03:00

main

Merge branch '1248-rename-lock-app' into 'master'

2018-09-19 14:28:34 +00:00

screenshotDebug

Move res values from build.gradle into strings.xml

2018-08-03 13:08:18 -03:00

test/java

Initialise EmojiManager for UI tests.

2018-08-28 15:55:16 +01:00