Commit 461cdc19 authored by Kevin Stover's avatar Kevin Stover

Fixing merge conflicts.

parents f5d7db22 ed621af1
......@@ -4,7 +4,7 @@
Tags: form, forms, contact form, custom form, form builder, form creator, form manager, form creation, contact forms, custom forms, forms builder, forms creator, forms manager, forms creation, form administration,
Requires at least: 4.4
Tested up to: 4.6
Stable tag: 3.0.12
Stable tag: 3.0.14
License: GPLv2 or later
With a simple drag and drop interface you can create contact forms, email subscription forms, order forms, payment forms, and any other type of form for your WordPress site.
......
......@@ -216,7 +216,7 @@ return apply_filters( 'ninja_forms_field_settings', array(
),
array(
'label' => __( 'Custom', 'ninja-forms' ),
'value' => __( 'custom', 'ninja-forms' ),
'value' => 'custom',
),
),
'value' => '',
......
Markdown is supported
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