]> wagnertech.de Git - timetracker.git/commitdiff
projects / timetracker.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 0afb05f)
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)
Conflicts:
.gitignore
WEB-INF/templates/footer.tpl


No differences found
Unnamed repository; edit this file 'description' to name the repository.