projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e3ca234
48a1153
)
Merge branch 'master' into next
author
Alexander Ebert
<ebert@woltlab.com>
Fri, 26 Jun 2015 18:30:25 +0000
(20:30 +0200)
committer
Alexander Ebert
<ebert@woltlab.com>
Fri, 26 Jun 2015 18:30:25 +0000
(20:30 +0200)
Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js
wcfsetup/install/files/lib/system/WCF.class.php
1
2
wcfsetup/install/files/js/3rdParty/redactor/plugins/wbutton.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/js/3rdParty/redactor/plugins/wbutton.js
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff