Skip to content
Snippets Groups Projects
Jonathan Weth's avatar
Jonathan Weth authored
# Conflicts:
#	schoolapps/dashboard/views.py
#	schoolapps/static/common/style.css
#	schoolapps/templates/partials/footer.html
#	schoolapps/timetable/views.py
6920cb01
History
Name Last commit Last update