Skip to content
Prev Previous commit
Merge remote-tracking branch 'upstream/master' into rel/0.13.0
* upstream/master: lets keep Satra the senior Update .zenodo.json
  • Loading branch information
satra committed May 12, 2017
commit 905912ec32557d7f58458157e2bb6faea8b3d72b

This merge commit was added into this branch cleanly.

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