Commit 7d1cd4d9 authored by bbaer's avatar bbaer
Browse files

Merge remote-tracking branch 'origin/punktetool' into punktetool

# Conflicts:
#	extension/qfq/qfq/database/DatabaseUpdateData.php
parents 05baaa54 b9553436
......@@ -104,6 +104,7 @@ $UPDATE_ARRAY = array(
],
'0.25.12' => [
"ALTER TABLE `FormElement` CHANGE `checkType` `checkType` ENUM('auto','alnumx','digit','numerical','email','pattern','allbut','all') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'auto';",
"ALTER TABLE `FormElement` CHANGE `label` `label` VARCHAR(511) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ''",
],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment