Commit 489adfee authored by Bruno Meyer's avatar Bruno Meyer 😢
Browse files

Merge branch 'alunos' into 'degree'

# Conflicts:
#   script/analysis/student_analysis.py
#   script/build_cache.py
parents d192ed73 d60a505f
......@@ -17,3 +17,4 @@ src/cache
.idea
**/__pycache__
*.ipynb
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment