Skip to content

Commit

Permalink
Merge tag '0.9.0' into develop
Browse files Browse the repository at this point in the history
Updating version to 0.9.0, including the latest changes to get closer to the release of version 1.0.0 according #32
  • Loading branch information
sebastian-code committed May 13, 2017
2 parents 3d8fcf5 + afaa003 commit 85f8517
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
# built documents.
#
# The short X.Y version.
version = '0.1.1'
version = '0.9.0'
# The full version, including alpha/beta/rc tags.
release = '0.1.1'
release = '0.9.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
django-annoying==0.10.3
django-markdown-app==0.9.0
django-taggit==0.22.0
pytz==2016.10
django-markdown-app==0.9.2
django-taggit==0.22.1
pytz==2017.2
django-hitcount==1.2.2
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

setup(
name='django-qa',
version='0.1.1',
version='0.9.0',
description='Pluggable django app for Q&A',
long_description=long_description,
author='arjunkomath, cdvv7788, sebastian-code, jlariza, swappsco',
Expand All @@ -34,9 +34,9 @@
],
install_requires=[
'django-annoying==0.10.3',
'django-markdown-app==0.9.0',
'django-taggit==0.22.0',
'pytz==2016.10',
'django-markdown-app==0.9.2',
'django-taggit==0.22.1',
'pytz==2017.2',
'django-hitcount==1.2.2'
],
extras_require={
Expand Down
2 changes: 1 addition & 1 deletion test_project/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
-e ../

# This project requirements
django-bootstrap3==8.2.1
django-bootstrap3==8.2.3
django-hitcount==1.2.2

0 comments on commit 85f8517

Please sign in to comment.