Skip to content

Commit

Permalink
Merge branch 'release_16.07' into dev
Browse files Browse the repository at this point in the history 
Conflicts:
	lib/galaxy/util/__init__.py
  • Loading branch information
@nsoranzo
nsoranzo committed Nov 7, 2016
2 parents 202f96c + 53a66c9 commit 3200fa3
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 3200fa3

Please sign in to comment.