Update dev - #150

Merged

lsetiawan merged 7 commits into

ODM2:developmentfrom

lsetiawan:update_dev

Feb 26, 2018

Commits on Nov 16, 2017

Update README.md
horsburgh
authored
2f82702

Commits on Jan 19, 2018

Merge pull request #142 from ODM2/development
emiliom
authored
85932e7

Commits on Feb 22, 2018

use conda-forge
ocefpaf
committed
c4d65e9

Commits on Feb 23, 2018

Merge pull request #148 from ocefpaf/use_conda-forge
emiliom
authored
ba09397

Commits on Feb 26, 2018

Add ipython for testing
lsetiawan
authored
e4f487d
Merge pull request #149 from ODM2/add_ipython
lsetiawan
authored
b8d76f6
Merge branch 'master' of https://github.com/ODM2/ODM2PythonAPI into development
lsetiawan
committed
d4e4425