Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update from Original #5

Closed
wants to merge 3 commits into from
Closed

Update from Original #5

wants to merge 3 commits into from

Commits on Nov 16, 2017

  1. custom index.html tweaks

    @dtc7240
    dtc7240 committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    2a018f6 View commit details
    Browse the repository at this point in the history

  2. committing so I can update 

    These files in the dist folder I believe are overwritten every time
gulp build is run, so they just don’t matter … but I can’t Update from
formio/master unless I do something with them.
    @dtc7240
    dtc7240 committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    f47aa8f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'formio/master' 

    # Conflicts:
#	dist/lib/formio-full.js
#	dist/lib/formio-full.min.css
#	dist/lib/formio-full.min.js
    @dtc7240
    dtc7240 committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    4e1d4f1 View commit details
    Browse the repository at this point in the history