Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 5 Apr 2014 23:42:45 +0000 (01:42 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 5 Apr 2014 23:42:45 +0000 (01:42 +0200)
commitf307e502528ed190a9d65ae487ce943b6c1159bf
treeceadaab5c77686d31e50ff543b1546dd780835b1
parent921dfb3d93fcf5d5bafdb31bf17c701a135bcd93
parent0293c6a09b069ba99e124100a2daef5f4399bfd9
Merge branch '2.0'

Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/WCF.Message.js
wcfsetup/install/files/js/WCF.Message.min.js
wcfsetup/install/files/js/WCF.min.js