projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eb6dd71 488643b)
Merge branch 'next' into next-redactor
authorAlexander Ebert <ebert@woltlab.com>
Tue, 7 Jul 2015 12:24:46 +0000 (14:24 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 7 Jul 2015 12:24:46 +0000 (14:24 +0200)
commitb4797c2f7bd16e682c8d9922ac3c548affb84100
tree51f28bee1c2c3ba784e9ea50c63f9aa119f5ddebtree | snapshot (tar.gz zip)
parenteb6dd716cb9c139c7ec9d92e6e549172835576b3commit | diff
parent488643bc27bbf802ecddabdec0e2b2a05d16df34commit | diff
Merge branch 'next' into next-redactor

Conflicts:
wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
wcfsetup/install/files/js/3rdParty/redactor/redactor.js diff1 | diff2 | blob | history
WoltLab Suite Core (previously WoltLab Community Framework)