projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6552b64
de70b07
)
Merge branch 'master' of github.com:WoltLab/WCF
author
Marcel Werk
<burntime@woltlab.com>
Thu, 11 Dec 2014 13:30:34 +0000
(14:30 +0100)
committer
Marcel Werk
<burntime@woltlab.com>
Thu, 11 Dec 2014 13:30:34 +0000
(14:30 +0100)
1
2
com.woltlab.wcf/templates/userPanel.tpl
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
com.woltlab.wcf/templates/userPanel.tpl
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