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

Mediation #219

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Mediation #219

wants to merge 10 commits into from

Commits on Dec 18, 2018

  1. add mediation and test (covr is too low)

    @lilymedina
    lilymedina committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    396b38a View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2018

  1. Merge branch 'master' into Mediation

    @lilymedina
    lilymedina committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    55a0eb6 View commit details
    Browse the repository at this point in the history

  2. check not passing yet check()

    @lilymedina
    lilymedina committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    16966a1 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2019

  1. Merge branch 'master' into Mediation

    @lilymedina
    lilymedina committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    ab033b2 View commit details
    Browse the repository at this point in the history

  2. tests checks and coverage looking good

    @lilymedina
    lilymedina committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    cd55d37 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2019

  1. suggest mediation

    @lilymedina
    lilymedina committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    75ba960 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2019

  1. namespace

    @lilymedina
    lilymedina committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    21109b7 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2019

  1. Merge branch 'master' into Mediation

    @jaspercooper
    jaspercooper committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    5dd24f0 View commit details
    Browse the repository at this point in the history

  2. update from master except mediation

    @lilymedina
    lilymedina committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    d89a29c View commit details
    Browse the repository at this point in the history

  3. solve mediation conflicts manually

    @lilymedina
    lilymedina committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    e45b9ee View commit details
    Browse the repository at this point in the history