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

Merge branch 'hotfix/ReportsPrinter' into develop 

Conflicts:
	db/StoredProcedures.sql
	~dev_rating/application/classes/Controller/Handler/FileCreator.php
	~dev_rating/application/classes/Model/Teacher/Rating.php
parents f17cf9b0 36021ae9
Expand all Hide whitespace changes
Inline Side-by-side
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