akwizgran 9d07b2e141 Resolve merge conflicts. ...

# Conflicts:
#   briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentController.java
#   briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java

2018-12-13 11:41:04 +00:00

..

.tx

Update translations, adds Hungarian, sets inclusion threshold to 80%

2018-09-12 07:45:02 -03:00

artwork

Merge branch '1224-show-explanation-when-contact-exchange-fails' into 'master'

2018-08-20 19:40:36 +00:00

fastlane

Refactor tests so that all test data is created in the first test

2018-09-24 12:37:11 -03:00

src

Resolve merge conflicts.

2018-12-13 11:41:04 +00:00

.gitignore

Move buildType to flavor and add hashes for pinning of androidTest dependencies

2018-08-03 11:20:33 -03:00

build.gradle

[android] support adding image attachments to private messages

2018-12-06 17:55:59 -02:00

proguard-rules.txt

[android] display image attachments for conversation messages

2018-11-19 20:35:07 -02:00

proguard-test.txt

Create Screenshot of Conversation for Manual

2018-09-24 12:34:26 -03:00

project.properties

tweaked proguard

2016-02-02 12:21:08 +01:00

witness.gradle

[android] support adding image attachments to private messages

2018-12-06 17:55:59 -02:00