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

1.10 updates #7682

Merged
merged 2 commits into from
Mar 8, 2018
Merged

1.10 updates #7682

merged 2 commits into from
Mar 8, 2018

Commits on Mar 8, 2018

  1. merge master to 1.10, with fixes

    JENNIFER RONDEAU committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    7525660 View commit details
    Browse the repository at this point in the history

  2. fix more merge conflicts

    JENNIFER RONDEAU committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    4fe8acf View commit details
    Browse the repository at this point in the history