playmusicexporter/playmusicexporter
1
0
Fork 0
mirror of https://github.com/playmusicexporter/playmusicexporter synced 2024-06-01 11:50:00 +00:00
Code Issues Releases Wiki Activity
playmusicexporter/framework/src
History
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
..
androidTest/java/de/arcus/framework Initial commit 2015-01-23 18:26:34 +01:00
main Merge branch 'feature/automation_fix' into develop 2017-01-19 00:23:20 +01:00