Skip to content
Snippets Groups Projects
Commit 1ab6ce4b authored by RomanSteinberg's avatar RomanSteinberg
Browse files

Merge branch 'feature/grading_credit' into develop

Conflicts:
	~dev_rating/application/classes/Model/Teachers.php
parents 311a637b 9085d3e1
Branches
Tags
No related merge requests found
Showing
with 412 additions and 208 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