diff options
| author | Clyhtsuriva <aimeric@adjutor.xyz> | 2021-06-26 13:37:26 +0200 |
|---|---|---|
| committer | Clyhtsuriva <aimeric@adjutor.xyz> | 2021-06-26 13:37:26 +0200 |
| commit | af5c7870e22162002e7d923864d8ac8d6177fbed (patch) | |
| tree | 763576d605b783905aa55ba22115d06fd0619225 /src/musichub/business | |
| parent | b6259755630be381b60cc1a7004e8366d3c2c07e (diff) | |
| parent | 2291069c473ded69640a28ba11c223c5fc241426 (diff) | |
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# bin/musichub/business/Album.class
# bin/musichub/business/AudioBook.class
# bin/musichub/business/AudioElement.class
# bin/musichub/business/Category.class
# bin/musichub/business/Genre.class
# bin/musichub/business/Language.class
# bin/musichub/business/MusicHub.class
# bin/musichub/business/NoAlbumFoundException.class
# bin/musichub/business/NoElementFoundException.class
# bin/musichub/business/NoPlayListFoundException.class
# bin/musichub/business/PlayList.class
# bin/musichub/business/Song.class
# bin/musichub/business/SortByAuthor.class
# bin/musichub/business/SortByDate.class
# bin/musichub/business/SortByGenre.class
# bin/musichub/main/Main.class
# bin/musichub/util/XMLHandler.class
# src/main/java/musichub/business/AudioElement.java
# src/main/java/musichub/business/MusicHub.java
# src/main/java/musichub/business/Song.java
# src/main/java/musichub/main/Main.java
Diffstat (limited to 'src/musichub/business')
0 files changed, 0 insertions, 0 deletions