Commit cb5d4b15 authored 4 years ago by vgm18

Merge branch 'Develop' into 'Vinicius_bug_fixing'

# Conflicts:
#   src/Components/CollectionCardFunction.js
#   src/Pages/ResourcePage.js
#   src/Pages/Search.js

parents e338ab8a 23ce93eb

Branches

Tags

3 merge requests!69Fixed upload page: recaptcha not implemented, lack of blocking (part one, two,...,!61Fixed upload page: recaptcha not implemented, lack of blocking (part one, two,...,!60Fixed upload page: recaptcha not implemented, lack of blocking (part one, two,...

Show whitespace changes

Inline Side-by-side

Showing with 661 additions and 711 deletions

Please register or to comment