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

Update Manifest #1197

Merged
merged 9 commits into from
Feb 16, 2017
Merged

Update Manifest #1197

merged 9 commits into from
Feb 16, 2017

Commits on Feb 2, 2017

  1. Merge remote-tracking branch 'open-source-economics/master'

    @andersonfrailey
    andersonfrailey committed Feb 2, 2017
    Configuration menu
    Copy the full SHA
    f6ac941 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2017

  1. commit before merging

    @andersonfrailey
    andersonfrailey committed Feb 6, 2017
    Configuration menu
    Copy the full SHA
    2bb2707 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'open-source-economics/master' 

    # Conflicts:
#	taxcalc/reforms/adjust0.json
#	taxcalc/reforms/ptaxes0.json
#	taxcalc/reforms/ptaxes1.json
#	taxcalc/reforms/ptaxes2.json
#	taxcalc/reforms/ptaxes3.json
    @andersonfrailey
    andersonfrailey committed Feb 6, 2017
    Configuration menu
    Copy the full SHA
    7ddb38c View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2017

  1. Merge remote-tracking branch 'open-source-economics/master'

    @andersonfrailey
    andersonfrailey committed Feb 7, 2017
    Configuration menu
    Copy the full SHA
    bb94028 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2017

  1. Merge remote-tracking branch 'open-source-economics/master'

    @andersonfrailey
    andersonfrailey committed Feb 8, 2017
    Configuration menu
    Copy the full SHA
    710a500 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2017

  1. Merge remote-tracking branch 'open-source-economics/master'

    @andersonfrailey
    andersonfrailey committed Feb 13, 2017
    Configuration menu
    Copy the full SHA
    7b62c2d View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2017

  1. Merge remote-tracking branch 'open-source-economics/master'

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

Commits on Feb 15, 2017

  1. Merge remote-tracking branch 'open-source-economics/master'

    @andersonfrailey
    andersonfrailey committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    e1c8155 View commit details
    Browse the repository at this point in the history

  2. update manifest

    @andersonfrailey
    andersonfrailey committed Feb 15, 2017
    Configuration menu
    Copy the full SHA
    e32c93b View commit details
    Browse the repository at this point in the history