]> wagnertech.de Git - timetracker.git/commitdiff
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)
Conflicts:
.gitignore
WEB-INF/config.php.dist


No differences found