Merge branch 'Develop' into 'Fixing_bugs_vinicius'
# Conflicts: # src/Pages/Search.js
No related branches found
No related tags found
Showing
- src/Components/CollectionAuthor.js 5 additions, 5 deletionssrc/Components/CollectionAuthor.js
- src/Components/CollectionCommentSection.js 29 additions, 6 deletionssrc/Components/CollectionCommentSection.js
- src/Components/CollectionDowloadButton.js 77 additions, 25 deletionssrc/Components/CollectionDowloadButton.js
- src/Components/FloatingDownloadButton.js 10 additions, 40 deletionssrc/Components/FloatingDownloadButton.js
- src/Components/ResourceList.js 54 additions, 22 deletionssrc/Components/ResourceList.js
- src/Components/ResourcePageComponents/CommentsArea.js 2 additions, 1 deletionsrc/Components/ResourcePageComponents/CommentsArea.js
- src/Pages/CollectionPage.js 16 additions, 13 deletionssrc/Pages/CollectionPage.js
- src/Pages/Search.js 23 additions, 12 deletionssrc/Pages/Search.js
- src/env.js 8 additions, 8 deletionssrc/env.js
Loading
Please register or sign in to comment