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

Master #62

Merged
merged 7 commits into from
Jun 20, 2016
Merged

Master #62

merged 7 commits into from
Jun 20, 2016

Commits on Jun 16, 2016

  1. Merge remote-tracking branch 'lochmueller/master'

    @fduarte42
    fduarte42 committed Jun 16, 2016
    Configuration menu
    Copy the full SHA
    fb3dc5d View commit details
    Browse the repository at this point in the history

  2. [FEATURE] - Added JsonServer Webservice Loader

    @fduarte42
    fduarte42 committed Jun 16, 2016
    Configuration menu
    Copy the full SHA
    a490702 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2016

  1. [FEATURE] - Added JsonServer Webservice Loader

    @fduarte42
    fduarte42 committed Jun 17, 2016
    Configuration menu
    Copy the full SHA
    6e1a7cf View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'lochmueller/master'

    @fduarte42
    fduarte42 committed Jun 17, 2016
    Configuration menu
    Copy the full SHA
    00e6ecc View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2016

  1. Merge remote-tracking branch 'lochmueller/master' 

    # Conflicts:
#	Resources/Private/Contrib/composer.json
#	Resources/Private/Contrib/composer.lock
#	Resources/Private/Contrib/vendor/composer/autoload_static.php
    @fduarte42
    fduarte42 committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    0a4ab48 View commit details
    Browse the repository at this point in the history

  2. [FEATURE] - Added JsonServer Webservice Loader 

    [FIXED] - Loading Contrib Packages
    @fduarte42
    fduarte42 committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    8fdd7a6 View commit details
    Browse the repository at this point in the history

  3. [FEATURE] - Added JsonServer Webservice Loader 

    [FIXED] - Loading Contrib Packages
    @fduarte42
    fduarte42 committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    82d716b View commit details
    Browse the repository at this point in the history