projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
acfd387
9d7e564
)
Merge branch 'master' of git://github.com/WoltLab/WCF into bug/dateDiffModifier
author
Matthias Schmidt
<gravatronics@live.com>
Tue, 9 Oct 2012 17:19:38 +0000
(19:19 +0200)
committer
Matthias Schmidt
<gravatronics@live.com>
Tue, 9 Oct 2012 17:19:38 +0000
(19:19 +0200)
Conflicts:
wcfsetup/install/files/lib/system/template/plugin/DatediffModifierTemplatePlugin.class.php
1
2
wcfsetup/install/files/lib/util/DateUtil.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/lang/de.xml
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/lang/en.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/lib/util/DateUtil.class.php
Simple merge
diff --cc
wcfsetup/install/lang/de.xml
Simple merge
diff --cc
wcfsetup/install/lang/en.xml
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff