• Kevin Stover's avatar
    Merge branch 'develop' · 2de9b606
    Kevin Stover authored
    # Conflicts:
    #	README.md
    #	assets/js/front-end/controllers/fieldRecaptcha.js
    #	assets/js/min/front-end.js
    #	assets/js/min/front-end.js.map
    #	deprecated/ninja-forms.php
    #	includes/Database/FieldsController.php
    #	ninja-forms.php
    #	readme.txt
    2de9b606
README.md 6.8 KB