Skip to content

Ready for MERGE: Add command to import preprocessed data #122

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

Merged
merged 15 commits into from
Jun 20, 2014
Merged

Ready for MERGE: Add command to import preprocessed data #122

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8419957
save before merge
teravest Jun 19, 2014
6426d81
merged
teravest Jun 19, 2014
f12dfb6
waiting on other pull requests
teravest Jun 19, 2014
e44c883
Solving merge conflicts
josenavas Jun 19, 2014
58c184a
Finishing up function
josenavas Jun 20, 2014
ae1f874
Solving merge conflicts (2)
josenavas Jun 20, 2014
fa27255
Merge branch 'master' of github.com:qiime/QiiTa into preproccesed
josenavas Jun 20, 2014
6449809
Adding tests
josenavas Jun 20, 2014
40ea6a5
Cleaning up environment
josenavas Jun 20, 2014
17181c1
changes before merge
teravest Jun 20, 2014
39238c5
changes before merge2
teravest Jun 20, 2014
26a2122
address comments
teravest Jun 20, 2014
6c572fc
should be good
teravest Jun 20, 2014
1ce7b11
hopefully last one
teravest Jun 20, 2014
1175b23
merge with master
teravest Jun 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' of github.com:qiime/QiiTa into preproccesed
  • Loading branch information
@josenavas
josenavas committed Jun 20, 2014
commit fa272556640de84befdd1921d8752152ebd38f3a

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.