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

Merge changes from 1.2 format repo #11244

Merged
merged 2 commits into from
Jan 23, 2018
Merged

Merge changes from 1.2 format repo #11244

merged 2 commits into from
Jan 23, 2018

Commits on Jan 18, 2018

  1. Partial format upgrade (conf-python-2-7.1.0) 

    Update done by Camelus based on opam-lib 2.0.0~beta6
There were conflicts with changes on the current 2.0.0 branch, so this is left unmerged. Conflicting files:
  - packages/conf-python-2-7/conf-python-2-7.1.0/opam
    @camelus
    camelus committed Jan 18, 2018
    Configuration menu
    Copy the full SHA
    7239417 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2018

  1. Merge branch '2.0.0' into camelus-2bec2453

    @AltGr
    AltGr authored Jan 23, 2018
    Configuration menu
    Copy the full SHA
    320fd20 View commit details
    Browse the repository at this point in the history