projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d749565 2026cec)
Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 22 Sep 2014 14:54:07 +0000 (16:54 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 22 Sep 2014 14:54:07 +0000 (16:54 +0200)
Conflicts:
wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
wcfsetup/install/files/js/WCF.ImageViewer.min.js
wcfsetup/install/files/lib/system/package/validation/PackageValidationArchive.class.php
wcfsetup/install/files/lib/system/package/validation/PackageValidationException.class.php
wcfsetup/install/files/lib/system/package/validation/PackageValidationManager.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

1  2 
wcfsetup/install/lang/de.xml patch | diff1 | diff2 | blob | history
wcfsetup/install/lang/en.xml patch | diff1 | diff2 | blob | history

diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)