Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sun, 18 Jan 2015 23:47:59 +0000 (00:47 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 18 Jan 2015 23:47:59 +0000 (00:47 +0100)
commit77c0017a276f7f68f7563b4d11149ee46a4376e3
treef28b5dcf7765f24a2eca2ea4278bdc8bd7f16752
parent9739bf9cf93fb759f8324674568f316e499b4187
parentab5e03421ebf8bd9f5bbce3d06cf78bc5827e64a
Merge branch '2.0'

Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/WCF.ImageViewer.min.js
wcfsetup/install/lang/de.xml