Skip to content
Snippets Groups Projects
Commit 0f23a87e authored by vgm18's avatar vgm18
Browse files

Merge branch 'Develop' into 'Develop_copy_to_implement_acessibility'

# Conflicts:
#   src/Admin/Components/Components/AdminTemplate.js
#   src/Admin/Components/Components/DataCards/CommunityQuestionCard.js
#   src/Admin/Components/Components/Inputs/CreateInstitution.js
#   src/Admin/Components/Components/Inputs/CreateLanguage.js
#   src/Admin/Components/Components/Inputs/CreateQuestion.js
#   src/Admin/Components/Components/Inputs/CreateRating.js
#   src/Admin/Components/Components/Inputs/CreateRole.js
#   src/Admin/Components/Components/Inputs/EditCollection.js
#   src/Admin/Components/Components/Inputs/EditEducationalObect.js
#   src/Admin/Components/Components/Inputs/EditLanguage.js
#   src/Admin/Components/Components/Inputs/EditRating.js
#   src/Admin/Components/Components/Inputs/EditRoles.js
#   src/Admin/Components/Components/Inputs/IntitutionsInputs.js
#   src/Admin/Components/Components/Inputs/NoteVarInputs.js
#   src/Admin/Components/Components/Unauthorized.js
#   src/App.js
#   src/Components/ButtonGuardarColecao.js
#   src/Components/CollectionCardFunction.js
#   src/Components/CollectionCommentSection.js
#   src/Components/ContactForm.js
#   src/Components/Firulas.js
#   src/Components/FormInput.js
#   src/Components/Header.js
#   src/Components/LoadingSpinner.js
#   src/Components/LoginModal.js
#   src/Components/ModalAvaliarRecurso.js
#   src/Components/ModalExcluirColecao.js
#   src/Components/PageProfessorComponents/PartOne.js
#   src/Components/ReportModal.js
#   src/Components/ReportUserForm.js
#   src/Components/ResourcePageComponents/CommentForm.js
#   src/Components/ResourcePageComponents/Sobre.js
#   src/Components/SignUpModal.js
#   src/Components/SnackbarComponent.js
#   src/Components/Stepper.js
#   src/Components/UploadPageComponents/Forms/Keywords.js
#   src/Components/UploadPageComponents/Stepper.js
#   src/Components/UploadPageComponents/StyledComponents.js
#   src/Components/UploadPageComponents/UploadFileWrapper.js
#   src/Components/carousel.css
#   src/Pages/ChangePasswordPage.js
#   src/Pages/EditProfilePage.js
#   src/Pages/ResourcePage.js
#   src/Pages/Search.js
parents 2ef8ef0c f9fbc30a
No related branches found
No related tags found
1 merge request!102Develop copy to implement accessibility
Showing
with 299 additions and 80 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment