-
lfr20 authored
# Conflicts: # src/Components/CollectionCardFunction.js # src/Components/Comment.js # src/Components/ContactButtons/FollowButton.js # src/Components/ContactButtons/FollowingButton.js # src/Components/ContactCardOptions.js # src/Components/MobileDrawerMenu.js # src/Components/ResourcePageComponents/Sobre.js # src/Components/SearchBar.js # src/Pages/UploadPage.js
lfr20 authored# Conflicts: # src/Components/CollectionCardFunction.js # src/Components/Comment.js # src/Components/ContactButtons/FollowButton.js # src/Components/ContactButtons/FollowingButton.js # src/Components/ContactCardOptions.js # src/Components/MobileDrawerMenu.js # src/Components/ResourcePageComponents/Sobre.js # src/Components/SearchBar.js # src/Pages/UploadPage.js