Merge master into blocksenders`

This commit is contained in:
Moez Bhatti
2015-10-18 22:38:56 -04:00
parent 4f31f33aef
commit 0dac7dbcc0
83 changed files with 891 additions and 760 deletions
+2
View File
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
repositories {
mavenCentral()
jcenter()
}
android {
@@ -74,6 +75,7 @@ dependencies {
compile 'com.googlecode.ez-vcard:ez-vcard:0.9.6'
compile 'com.google.code.gson:gson:2.3'
compile 'com.koushikdutta.ion:ion:1.1.7'
compile 'org.ligi:snackengage:0.4'
// Google libraries
compile 'com.android.support:appcompat-v7:22.2.1'