projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
be515b4
0c26377
)
Merge branch '2.0'
author
Marcel Werk
<burntime@woltlab.com>
Sun, 5 Oct 2014 14:00:13 +0000
(16:00 +0200)
committer
Marcel Werk
<burntime@woltlab.com>
Sun, 5 Oct 2014 14:00:13 +0000
(16:00 +0200)
Conflicts:
wcfsetup/install/files/js/WCF.ACL.min.js
1
2
wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff