Skip to content
Snippets Groups Projects
Commit 489adfee authored by Bruno Meyer's avatar Bruno Meyer :cry:
Browse files

Merge branch 'alunos' into 'degree' 

# Conflicts:
#   script/analysis/student_analysis.py
#   script/build_cache.py
parents d192ed73 d60a505f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
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