projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eb6dd71
488643b
)
Merge branch 'next' into next-redactor
author
Alexander Ebert
<ebert@woltlab.com>
Tue, 7 Jul 2015 12:24:46 +0000
(14:24 +0200)
committer
Alexander Ebert
<ebert@woltlab.com>
Tue, 7 Jul 2015 12:24:46 +0000
(14:24 +0200)
Conflicts:
wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
1
2
wcfsetup/install/files/js/3rdParty/redactor/redactor.js
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wcfsetup/install/files/js/3rdParty/redactor/redactor.js
Simple merge
projects / GitHub / WoltLab / WCF.git / commitdiff