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

Merging release_config.json with config.json #568

Closed
wants to merge 3 commits into from
Closed

Merging release_config.json with config.json #568

wants to merge 3 commits into from

Commits on Jul 24, 2016

  1. Merging release_config.json with config.json

    @elicwhite
    elicwhite committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    1000756 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into merge-config 

    Conflicts:
	README.md
    @elicwhite
    elicwhite committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    a67af42 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into merge-config

    @elicwhite
    elicwhite committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    0d44885 View commit details
    Browse the repository at this point in the history