Skip to content

Commit

Permalink
Merge pull request #3791 from timgraham/treebeard-3.0
Browse files Browse the repository at this point in the history
Updated to treebeard 3.0.
  • Loading branch information
yakky committed Jan 22, 2015
2 parents 584a37b + 1e811ed commit 0dbb961
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions docs/how_to/integrate.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Requirements
* `Django`_ 1.4.5, 1.5.x, 1.6.x or 1.7.x
* `South`_ 1.0.1 or higher (Only required up to Django 1.6)
* `django-classy-tags`_ 0.5 or higher
* `django-treebeard`_ 2.0
* `django-treebeard`_ 3.0
* `django-sekizai`_ 0.7 or higher
* `html5lib`_ 0.99 or higher
* `djangocms-admin-style`_
Expand Down Expand Up @@ -140,7 +140,7 @@ its dependencies:
Django>=1.7

South==1.0.2 # Only needed for Django < 1.7
django-treebeard==2.0
django-treebeard==3.0
django-sekizai==0.7
django-classy-tags==0.5
djangocms-admin-style==0.2.2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
'django-classy-tags>=0.5',
'south>=0.7.2',
'html5lib',
'django-treebeard==2.0',
'django-treebeard==3.0',
'django-sekizai>=0.7',
'djangocms-admin-style'
],
Expand Down
2 changes: 1 addition & 1 deletion test_requirements/requirements_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sphinx
Pillow==2.5.3
django-classy-tags>=0.5
html5lib>=0.90
django-treebeard==2.0
django-treebeard==3.0
django-sekizai>=0.7
argparse
dj-database-url
Expand Down

0 comments on commit 0dbb961

Please sign in to comment.