projects / timetracker.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5804c13 5ce20fc)
Merge remote-tracking branch 'upstream/master'
authorAnže Videnič <anze.videnic@gmail.com>
Mon, 4 Jul 2016 13:54:22 +0000 (15:54 +0200)
committerAnže Videnič <anze.videnic@gmail.com>
Mon, 4 Jul 2016 13:54:22 +0000 (15:54 +0200)
commit61d8edb3db70bd197ed6b988727394633b0cecf9
tree8dc3e7f54188dd526e186d5e9e1b5e289cfbded0tree | snapshot
parent5804c13dc7c50b694c51dc443599c994f1d29b66commit | diff
parent5ce20fc5d56a32584f8a2d18ae7cde91eb12a5a4commit | diff
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.
WEB-INF/lib/ttTeamHelper.class.php diff1 | diff2 | blob | history
WEB-INF/templates/footer.tpl diff1 | diff2 | blob | history
WEB-INF/templates/time.tpl diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.