Merge branch 'master' of https://github.com/avidenic/timetracker into avidenic-master
authorNik Okuntseff <support@anuko.com>
Mon, 18 Jul 2016 17:26:45 +0000 (17:26 +0000)
committerNik Okuntseff <support@anuko.com>
Mon, 18 Jul 2016 17:26:45 +0000 (17:26 +0000)
commit0afb05f8218082cb068f17a0f16f5bcb5c32131e
tree4d379ff2e7cfc8b749fa93cce04bad16ef348d0b
parented13397ab74c0892efe2cfff855a53cf11e15a36
parent61d8edb3db70bd197ed6b988727394633b0cecf9
Merge branch 'master' of https://github.com/avidenic/timetracker into avidenic-master

Conflicts:
.gitignore
WEB-INF/templates/footer.tpl
dbinstall.php