Added user merge
authorMarcel Werk <burntime@woltlab.com>
Tue, 9 Jul 2013 22:28:19 +0000 (00:28 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 9 Jul 2013 22:28:19 +0000 (00:28 +0200)
commit187c9504c6184511c9b44744e3a26232c94c1d77
tree652db59d53efa2cc071d5d963a667017eb985770
parentfd6bb9005fd6b15dea036f57b202760a6826403a
Added user merge
wcfsetup/install/files/acp/templates/dataImport.tpl
wcfsetup/install/files/lib/acp/form/DataImportForm.class.php
wcfsetup/install/files/lib/system/importer/ImportHandler.class.php
wcfsetup/install/files/lib/system/importer/UserImporter.class.php
wcfsetup/install/files/lib/system/worker/ImportWorker.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml