Merge remote-tracking branch 'refs/remotes/origin/2.8-release'

# Conflicts:
#	app/build.gradle
This commit is contained in:
misaochan 2018-07-05 01:00:51 +10:00
commit 107729cdf0
4 changed files with 18 additions and 2 deletions

View file

@ -21,7 +21,7 @@ dependencies {
implementation 'com.jakewharton.timber:timber:4.5.1'
implementation 'info.debatty:java-string-similarity:0.24'
implementation 'com.borjabravo:readmoretextview:2.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
implementation('com.mapbox.mapboxsdk:mapbox-android-sdk:5.5.0@aar') {
transitive = true
}