Commit 937e1070 authored by Kevin Stover's avatar Kevin Stover

Merge branch '3.0-alpha' of github.com:wpninjas/ninja-forms into 3.0-alpha

# Conflicts:
#	assets/js/builder/controllers/app/domainConfig.js
#	assets/js/builder/views/appMenuButtons.js
parents 7a0c2d25 01b81460
......@@ -70,6 +70,7 @@ define( [
return new fieldsMainContentFieldCollectionView( { collection: collection } );
}
},
/**
* Commented out for Alpha 1 Hartnell
*/
......
......@@ -95,4 +95,5 @@ function nf_tmp_file_upload() {
}
add_shortcode( 'nf_tmp_file_upload', 'nf_tmp_file_upload' );
*/
\ No newline at end of file
......@@ -29,7 +29,7 @@ if( defined( 'LOAD_DEPRECATED') AND LOAD_DEPRECATED ) {
/**
* @since 3.0
*/
const VERSION = '2.9.27';
const VERSION = '3.0 Alpha-1-Hartnell';
/**
* @since 3.0
......
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