Исправлена ошибка при поиске логов
Change log output
изменеения в логах
Merge branch 'master' of github.com:vsg68/cupv
before merge
Merge branch 'master' of github.com:vsg68/cupv
change cups letter
Очередное исправление вывода лога
before merge
Merge branch 'iface' of github.com:vsg68/cupv into iface
Merge branch 'iface' of github.com:vsg68/cupv into iface
Merge branch 'iface' of github.com:vsg68/cupv into iface
Merge branch 'iface' of github.com:vsg68/cupv into iface
before merge
сделан 3-х колоночный интерфейс
убрали тектариа и оставили одну дату
Merge branch 'itbase'

Conflicts:
	assets/views/form_rec.php
	web/js/init.js
Merge branch 'master' of github.com:vsg68/cupv
не хочет менять файл на сервере
Merge branch 'master' of github.com:vsg68/cupv