Skip to content
Snippets Groups Projects
Commit 6f04f23e authored by Eduardo L. Buratti's avatar Eduardo L. Buratti
Browse files

Merge branch 'web' of git.c3sl.ufpr.br:minicom/datasid/testing into web


Signed-off-by: default avatarEduardo L. Buratti <elb09@c3sl.ufpr.br>

Conflicts:
	web/assets/js/attendance.js
parents 4d5d63e5 bd44e775
No related branches found
No related tags found
No related merge requests found
Showing
with 374 additions and 15 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment