projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
96c1642
e7ee059
)
Merge remote-tracking branch 'refs/remotes/origin/session' into next
author
Alexander Ebert
<ebert@woltlab.com>
Wed, 6 Apr 2016 10:18:40 +0000
(12:18 +0200)
committer
Alexander Ebert
<ebert@woltlab.com>
Wed, 6 Apr 2016 10:18:40 +0000
(12:18 +0200)
# Conflicts:
# wcfsetup/install/files/lib/data/session/Session.class.php
# wcfsetup/install/files/lib/data/session/virtual/SessionVirtual.class.php
1
2
wcfsetup/install/files/lib/data/acp/session/ACPSession.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/install/files/lib/data/session/Session.class.php
patch
|
diff1
|
diff2
|
blob
|
history
wcfsetup/setup/db/install.sql
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/lib/data/acp/session/ACPSession.class.php
Simple merge
diff --cc
wcfsetup/install/files/lib/data/session/Session.class.php
Simple merge
diff --cc
wcfsetup/setup/db/install.sql
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff