Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	HISTORY.rst
  • Loading branch information
Bruno Alla committed May 22, 2017
2 parents b9cd23f + 35258fa commit 0c717a3
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 0c717a3

Please sign in to comment.