Skip to content
Snippets Groups Projects
Commit b15c87e6 authored by Lucas Soni Teixeira's avatar Lucas Soni Teixeira
Browse files

Merge branch 'master' into 'homologa'

# Conflicts:
#   src/components/Pages/TeamComponent.js
parents 44c15346 2ebf5957
Branches
No related tags found
1 merge request!78Homologa to produção
......@@ -18,6 +18,7 @@
"leaflet": "^1.6.0",
"leaflet-maskcanvas": "^1.0.0",
"loaders.css": "^0.1.2",
"material-table": "^1.36.0",
"node-sass": "^4.13.1",
"react": "^16.12.0",
"react-apexcharts": "^1.3.7",
......
......@@ -128,6 +128,10 @@ function TeamComponent(){
<h2>Fernando Gbur dos Santos</h2>
<p>UFPR/ Graduando em Computação</p>
</Grid>
<Grid className="developers-item">
<h2>Fernando Gbur dos Santos</h2>
<p>Laboratório de Dados Educacionais / C3SL</p>
</Grid>
<Grid className="developers-item">
<h2>Guiusepe Oneda Dal Pai</h2>
<p>UFPR/ Graduando em Computação</p>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment