From: Anže Videnič <anze.videnic@gmail.com>
Date: Mon, 4 Jul 2016 13:54:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: timetracker_1.19-1~1702^2^2
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=61d8edb3db70bd197ed6b988727394633b0cecf9;p=timetracker.git

Merge remote-tracking branch 'upstream/master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
---

61d8edb3db70bd197ed6b988727394633b0cecf9
diff --cc WEB-INF/templates/footer.tpl
index 5da4e2a6,f9a7eddc..6ff01ef6
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@@ -12,7 -12,7 +12,7 @@@
        <br>
        <table cellspacing="0" cellpadding="4" width="100%" border="0">
          <tr>
-           <td align="center">&nbsp;Anuko Time Tracker 1.9.25.3498 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
 -          <td align="center">&nbsp;Anuko Time Tracker 1.9.25.3499 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
++          <td align="center">&nbsp;Anuko Time Tracker 1.9.30.0000 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
              <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
              <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
              <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>