Karim Abou Zeid 69bb951e1d Merge branch 'master' into phonograph_pro ... # Conflicts: # app/src/main/res/values/strings.xml		2017-08-30 20:58:09 +02:00
..
libs	Removed unnecessary libs and replaced the jaudiotagger jar with a custom one specially or android.	2015-05-31 18:02:55 +02:00
src	Merge branch 'master' into phonograph_pro	2017-08-30 20:58:09 +02:00
build.gradle	Temporary fix for advancedrecyclerview	2017-08-30 18:39:58 +02:00
crashlytics.properties	Removed to files from .gitignore	2015-03-05 17:21:55 +01:00
proguard-rules.pro	Updated Glide	2016-02-06 01:11:40 +01:00