Skip to content

Commit

Permalink
Merge branch 'distribution' into develop
Browse files Browse the repository at this point in the history 
Conflicts:
	.travis.yml
	examples/p2p_holonomic_blocking.py
	setup.py
  • Loading branch information
@rubenvanparys
rubenvanparys committed May 3, 2017
2 parents 63529ea + 0a2f7a6 commit 54d0e95
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 54d0e95

Please sign in to comment.