• Bruno Meyer's avatar
    Merge branch '114-integrar-analises-relacionada-ao-curso-com-o-sistema-web' into 'development' · d15afbdd
    Bruno Meyer authored
    # Conflicts:
    #   src/adega/settings.py
    #   src/adega/static/adega/js/adega-chart.js
    #   src/adega/templates/adega/navbar.html
    #   src/adega/templates/base.html
    #   src/adega/urls.py
    #   src/admission/templates/admission/index.html
    #   src/course/templates/course/index.html
    #   src/course/views.py
    #   src/report_api/views.py
    #   src/script/analysis/course_analysis.py
    #   src/script/build_cache.py
    d15afbdd