Skip to content

Commit

Permalink
Merge branch 'hotfix/0.7.51'
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonsydes committed Dec 17, 2018
2 parents 9dc4770 + 2773ca1 commit 4107e3a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Prost! SoftwareAcademic License Agreement April 16, 2015
Prost! Software Academic License Agreement April 16, 2015

The Prost! software ("Software") has been developed by the contributing
researchers Peter Batzel, Jason Sydes, and Thomas Desvignes ("Developers") and
made available through the University of Oregon ("UO") for your internal,
non-profit research use. The Software was developed through support of a
variety of funding sources, including the NIH grants U01 DE020076, and R01
OD011116, and 5R240D011199. UO and the Developers allow researchers at your
OD011116, and R24 OD011199. UO and the Developers allow researchers at your
Institution to run, display, copy and modify Software on the following
conditions:

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.50
0.7.51
2 changes: 1 addition & 1 deletion prost/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Autogenerated via git flow.
__version__ = '0.7.50'
__version__ = '0.7.51'

0 comments on commit 4107e3a

Please sign in to comment.