Merge remote-tracking branch 'origin/feature/db_refactoring' into dev (bbca21ca) · Commits · Anton Yushko / grade

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit bbca21ca authored 9 years ago by

xamgore

Browse files

Merge remote-tracking branch 'origin/feature/db_refactoring' into dev

Conflicts:
	db/StoredFunctions.sql
	~dev_rating/application/classes/Model/Teacher.php

parents 792e1bbb 4cd9a858

Branches

Admin message

Merge remote-tracking branch 'origin/feature/db_refactoring' into dev