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.

diff --cc WEB-INF/lib/ttTeamHelper.class.php
Simple merge

diff --cc WEB-INF/templates/footer.tpl
index 5da4e2a,f9a7edd..6ff01ef
--- 1/WEB-INF/templates/footer.tpl
--- 2/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>

diff --cc WEB-INF/templates/time.tpl
Simple merge