projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
570dd41
7bbca52
)
Merge branch '2.1' into 3.0
author
Matthias Schmidt
<gravatronics@live.com>
Wed, 7 Feb 2018 18:52:26 +0000
(19:52 +0100)
committer
Matthias Schmidt
<gravatronics@live.com>
Wed, 7 Feb 2018 18:52:26 +0000
(19:52 +0100)
# Conflicts:
# wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
#
wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplateP
lugin.class.php
1
2
wcfsetup/install/files/lib/data/user/UserContentAction.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/system/session/SessionHandler.class.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/lib/data/user/UserContentAction.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/system/session/SessionHandler.class.php
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff