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

Maps #25

Merged
merged 4 commits into from
Mar 1, 2017
Merged

Maps #25

merged 4 commits into from
Mar 1, 2017

Commits on Feb 14, 2017

  1. adds information on maps to the readme #21

    @jackcarlisle
    jackcarlisle committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    f1b2ea1 View commit details
    Browse the repository at this point in the history

  2. changes the note #21

    @jackcarlisle
    jackcarlisle committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    3267510 View commit details
    Browse the repository at this point in the history

  3. resolves merge conflicts #21

    @jackcarlisle
    jackcarlisle committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    b3582b1 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2017

  1. Merge branch 'master' into maps

    @jackcarlisle
    jackcarlisle committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    521d7d5 View commit details
    Browse the repository at this point in the history