Merge remote-tracking branch 'origin/master'

This commit is contained in:
Karim Abou Zeid 2015-06-15 15:49:51 +02:00
commit 7fcb4a314e
16 changed files with 144 additions and 47 deletions

View file

@ -15,7 +15,6 @@ apply plugin: 'com.jakewharton.hugo'
repositories {
maven { url 'https://maven.fabric.io/public' }
maven { url 'https://dl.bintray.com/drummer-aidan/maven' }
}
@ -27,8 +26,8 @@ android {
applicationId "com.kabouzeid.gramophone"
minSdkVersion 16
targetSdkVersion 22
versionCode 36
versionName "0.9.20b dev-1"
versionCode 38
versionName "0.9.22b dev-1"
}
buildTypes {
@ -66,6 +65,6 @@ dependencies {
compile 'de.hdodenhof:circleimageview:1.3.0'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
compile 'com.afollestad:material-dialogs:0.7.5.5'
compile 'com.afollestad:material-dialogs:0.7.6.0'
compile 'com.afollestad:material-cab:0.1.4'
}