Merge branch 'taskChanges' of https://github.com/avidenic/timetracker into avidenic...
authorNik Okuntseff <support@anuko.com>
Mon, 18 Jul 2016 18:16:52 +0000 (18:16 +0000)
committerNik Okuntseff <support@anuko.com>
Mon, 18 Jul 2016 18:16:52 +0000 (18:16 +0000)
commitba0b5f34efabfeded3112115086eaa9d00f2a345
tree00a0bd8bc54292557dc5dc56833d8839f007cdfc
parent83c8992f7e4be2e564ff66d7a317184cd1ee945e
parentd5f3baa962fc5fbd79ab0743c23f8baf8412282b
Merge branch 'taskChanges' of https://github.com/avidenic/timetracker into avidenic-taskChanges

Conflicts:
.gitignore
WEB-INF/config.php.dist
WEB-INF/config.php.dist
time.php