Skip to content
Snippets Groups Projects
Commit 45277fec authored by Чердынцева Марина's avatar Чердынцева Марина
Browse files

Merge branch 'develop' of http://itlab.mmcs.sfedu.ru/git/grade-rating into develop

Conflicts:
	~dev_rating/media/js/rating.js
parents 421c1706 69428e3c
Branches
Tags
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