Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-21 07:09:56 +01:00
Code Issues Projects Releases Wiki Activity

Resolve merge conflicts.

Browse Source
This commit is contained in:
akwizgran
2018-05-07 14:37:32 +00:00
parent a3b5ff0bc0 2908145a06
commit 286937e472
8 changed files with 382 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -8,8 +8,6 @@ cache:
before_script:
- set -e
- export GRADLE_USER_HOME=$PWD/.gradle
# Accept the license for the Android build tools
- echo y | /opt/android-sdk/tools/bin/sdkmanager "build-tools;26.0.2"
test:
script: