Added 'merge users by e-mail address'
authorMarcel Werk <burntime@woltlab.com>
Thu, 21 Nov 2013 17:42:41 +0000 (18:42 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 21 Nov 2013 17:42:41 +0000 (18:42 +0100)
commit2df9ae3275aa55916dd768e48047f53c942ca8e1
tree866ca3c11347b2c2a5ec7e60ab2e336179fb8073
parentf1d3f2b7172b21edf7fda8c1843e147a7e298b63
Added 'merge users by e-mail address'
wcfsetup/install/files/acp/templates/dataImport.tpl
wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
wcfsetup/install/files/lib/system/cli/command/ImportCLICommand.class.php
wcfsetup/install/files/lib/system/importer/UserImporter.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml