Unverified Commit 5ed588a9 authored by Max Lv's avatar Max Lv Committed by GitHub

Merge branch 'master' into rust

parents 2b4d045f 2f6319de
...@@ -14,9 +14,8 @@ buildscript { ...@@ -14,9 +14,8 @@ buildscript {
junitVersion = '4.13' junitVersion = '4.13'
androidTestVersion = '1.2.0' androidTestVersion = '1.2.0'
androidEspressoVersion = '3.2.0' androidEspressoVersion = '3.2.0'
ndkVersion = '21.0.6113669' versionCode = 5000650
versionCode = 5000550 versionName = '5.0.6-nightly'
versionName = '5.0.5-nightly'
resConfigs = ['ar', 'es', 'fa', 'fr', 'ja', 'ko', 'ru', 'tr', 'zh-rCN', 'zh-rTW'] resConfigs = ['ar', 'es', 'fa', 'fr', 'ja', 'ko', 'ru', 'tr', 'zh-rCN', 'zh-rTW']
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment