resolve merge conflict
Showing
- .env.docker 17 additions, 0 deletions.env.docker
- .env.example 16 additions, 0 deletions.env.example
- .gitignore 3 additions, 0 deletions.gitignore
- README.md 1 addition, 1 deletionREADME.md
- docker-compose.yml 22 additions, 0 deletionsdocker-compose.yml
- index.php 19 additions, 3 deletionsindex.php
- migrations/tonality.sql 4 additions, 0 deletionsmigrations/tonality.sql
- public/components/NavBar.php 1 addition, 1 deletionpublic/components/NavBar.php
- public/components/Pagination.php 5 additions, 1 deletionpublic/components/Pagination.php
- public/js/Search.js 66 additions, 77 deletionspublic/js/Search.js
- scripts/build-image.sh 1 addition, 0 deletionsscripts/build-image.sh
- src/bases/BaseClient.php 13 additions, 0 deletionssrc/bases/BaseClient.php
- src/bases/BaseModel.php 1 addition, 1 deletionsrc/bases/BaseModel.php
- src/clients/RESTClient.php 92 additions, 0 deletionssrc/clients/RESTClient.php
- src/clients/SOAPClient.php 76 additions, 0 deletionssrc/clients/SOAPClient.php
- src/controllers/AlbumController.php 41 additions, 79 deletionssrc/controllers/AlbumController.php
- src/controllers/PremiumAlbumController.php 88 additions, 0 deletionssrc/controllers/PremiumAlbumController.php
- src/controllers/SongController.php 1 addition, 1 deletionsrc/controllers/SongController.php
- src/controllers/SubscriptionController.php 61 additions, 0 deletionssrc/controllers/SubscriptionController.php
- src/controllers/UploadFileController.php 35 additions, 0 deletionssrc/controllers/UploadFileController.php
Please register or sign in to comment