убрали тектариа и оставили одну дату
Merge branch 'itbase'

Conflicts:
	assets/views/form_rec.php
	web/js/init.js
Merge branch 'master' of github.com:vsg68/cupv