Skip to content

Commit

Permalink
Merge branch 'requires-io-develop' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	requirements-dev.txt
  • Loading branch information
GaretJax committed Feb 13, 2016
2 parents 280ec8b + 6bec287 commit 5712846
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ pep8<1.6,>=1.5.7
pyflakes

# Documentation
Jinja2==2.7.3
Jinja2==2.8
MarkupSafe==0.23
Pygments==2.0.2
Sphinx==1.2.3
Pygments==2.1
Sphinx==1.3.5
docutils==0.12

0 comments on commit 5712846

Please sign in to comment.