aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorClyhtsuriva <aimeric@adjutor.xyz>2021-05-19 08:44:09 +0200
committerClyhtsuriva <aimeric@adjutor.xyz>2021-05-19 08:44:09 +0200
commit1740c8c0ec4a7fe371c30bc6be784bdc9407dbe2 (patch)
tree76cfaf2a9ee0f3f867b584a43b2be14a950be252 /app
parent7193cbec73484ae71e4cf93a6ad959a09ad7dd4e (diff)
parent67be76376ab6263ec1d97ea68d561bf90844df9d (diff)
downloadAniki-1740c8c0ec4a7fe371c30bc6be784bdc9407dbe2.tar.gz
Aniki-1740c8c0ec4a7fe371c30bc6be784bdc9407dbe2.tar.bz2
Aniki-1740c8c0ec4a7fe371c30bc6be784bdc9407dbe2.zip
Merge branch 'master' into develop
Diffstat (limited to 'app')
0 files changed, 0 insertions, 0 deletions
sertions'>+81 2020-12-19Adding AudioBooksClyhtsuriva7-48/+225 2020-12-11(De)Serialization of the songsClyhtsuriva2-42/+63 2020-12-11Getting serialization working with a songClyhtsuriva3-7/+36 2020-12-11adding Serialization interface and methodsClyhtsuriva6-59/+63 2020-12-07Big updateMasfehico6-16/+99 2020-12-07cleaning and adding stuff in playlistMasfehico3-2/+20 2020-12-07Updating song and audiobook accordingly to the last commitMasfehico2-8/+8 2020-12-07Adding the enum classesMasfehico3-0/+9 2020-12-07Updating song, audiobook and musical elements's sets and getsMasfehico3-5/+23 2020-12-07Finishing MusicalElement.javaMasfehico1-6/+11 2020-11-23Cleaning upMasfehico2-30/+0 2020-11-23Deleting the CSVSMasfehico5-3669/+0 2020-11-23Minor testing changesMasfehico7-43/+63 2020-11-23Musical elements updated and jMusicHub basic creationMasfehico2-0/+0 2020-11-23Musical elements updated and jMusicHub basic creationMasfehico4-3/+74 2020-11-21README.md updatedMasfehico1-3/+1 2020-11-19Started Song and MusicalElementMasfehico5-0/+190 2020-11-18Added CSVsMasfehico9-102/+3756 2020-11-18Firs filesMasfehico8-0/+103 2020-11-17LICENSE updatedMasfehico1-68/+81