]> wagnertech.de Git - timetracker.git/commitdiff
projects / timetracker.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed13397 61d8edb)
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

1  2 
dbinstall.php patch | diff1 | diff2 | blob | history

diff --cc dbinstall.php
index 34f3a8b59962abd7c6cd4eac35471e00640988b9,1009f5198a39bb24b74cb768e4559ae7a0a46bee..a511617bb37f275c8c7565a73d2cab70e953c9a8
mode 100644,100755..100755
--- 1/dbinstall.php
--- 2/dbinstall.php
+++ b/dbinstall.php
Unnamed repository; edit this file 'description' to name the repository.