playmusicexporter/framework
Jan Christian Grünhage 42b72e822a
Merge branch 'feature/automation_fix' into develop
# Conflicts:
#	framework/framework.iml
#	playmusicexporter/playmusicexporter.iml
#	playmusicexporter/src/main/java/re/jcg/playmusicexporter/settings/PlayMusicExporterPreferences.java
2017-01-19 00:23:20 +01:00
..
src Merge branch 'feature/automation_fix' into develop 2017-01-19 00:23:20 +01:00
.gitignore Initial commit 2015-01-23 18:26:34 +01:00
build.gradle Finished AppIntro 2017-01-18 23:40:51 +01:00
framework.iml Merge branch 'feature/automation_fix' into develop 2017-01-19 00:23:20 +01:00
proguard-rules.pro Initial commit 2015-01-23 18:26:34 +01:00