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

8 collapse samples #169

Merged
merged 8 commits into from
Oct 24, 2015
Merged

8 collapse samples #169

merged 8 commits into from
Oct 24, 2015

Commits on Oct 22, 2015

  1. Merge branch '5-alpha_diversity' into 8-collapse_samples

    @wasade
    wasade committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    6d47355 View commit details
    Browse the repository at this point in the history

  2. Merge branch '6-beta_diversity' into 8-collapse_samples 

    Conflicts:
	.travis.yml
    @wasade
    wasade committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    8abbd9d View commit details
    Browse the repository at this point in the history

  3. Merge branch '7-taxonomy_summaries' into 8-collapse_samples

    @wasade
    wasade committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    dfe0ca7 View commit details
    Browse the repository at this point in the history

  4. get travis to run collapse

    @wasade
    wasade committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    3b9335d View commit details
    Browse the repository at this point in the history

  5. updated chp refs for 8

    @wasade
    wasade committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    3da1630 View commit details
    Browse the repository at this point in the history

  6. added collapse samples

    @wasade
    wasade committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    4629d96 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2015

  1. Merge branch 'master' of github.com:qiime/American-Gut into 8-collaps… 

    …e_samples

Conflicts:
	.travis.yml
    @wasade
    wasade committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    4944d16 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:qiime/American-Gut into 8-collaps… 

    …e_samples

Conflicts:
	.travis.yml
    @wasade
    wasade committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    323c9f4 View commit details
    Browse the repository at this point in the history