diff options
| author | cyberta <cyberta@riseup.net> | 2017-09-27 14:25:14 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2017-09-27 14:25:14 +0000 |
| commit | 51afe1eeba990c2cd57bd842a96f7a756df51ce8 (patch) | |
| tree | 88a1dd563eb6917551e38e80b08cb70ac3260235 /app/src/main/res/values | |
| parent | d944721a35786a48b996ef088f0311b1835180a7 (diff) | |
| parent | bae5bd200f129955b396c066814efc103f0bb0b1 (diff) | |
Merge branch 'develop' into 'master'
update ndk and sdk for gitlab ci
See merge request leap/bitmask_android!7
Diffstat (limited to 'app/src/main/res/values')
0 files changed, 0 insertions, 0 deletions