Merge branch 'master' into master

This commit is contained in:
Paul Hawke 2017-07-06 12:55:14 -05:00 committed by GitHub
commit 883419844d
4 changed files with 37 additions and 10 deletions

View file

@ -20,7 +20,7 @@ dependencies {
compile 'com.jakewharton.timber:timber:4.5.1'
compile 'com.squareup.okhttp3:okhttp:3.8.1'
compile 'com.squareup.okio:okio:1.13.0'
compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.0.2@aar'){
compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0@aar'){
transitive=true
}
compile 'com.facebook.fresco:fresco:1.3.0'