projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
55b402a
df4aca5
)
Merge branch 'next-lantia' of github.com:WoltLab/WCF into next-lantia
author
Marcel Werk
<burntime@woltlab.com>
Fri, 4 Dec 2015 17:37:29 +0000
(18:37 +0100)
committer
Marcel Werk
<burntime@woltlab.com>
Fri, 4 Dec 2015 17:37:29 +0000
(18:37 +0100)
1
2
wcfsetup/install/files/lib/system/WCF.class.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/lib/system/WCF.class.php
Simple merge