From: Nik Okuntseff <support@anuko.com>
Date: Mon, 18 Jul 2016 17:26:45 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/avidenic/timetracker into avidenic-master
X-Git-Tag: timetracker_1.19-1~1702^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0afb05f8218082cb068f17a0f16f5bcb5c32131e;p=timetracker.git

Merge branch 'master' of https://github.com/avidenic/timetracker into avidenic-master

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

0afb05f8218082cb068f17a0f16f5bcb5c32131e
diff --cc dbinstall.php
index 34f3a8b5,1009f519..a511617b
mode 100644,100755..100755
--- a/dbinstall.php
+++ b/dbinstall.php