Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-18 14:00:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into treebeard-update

Browse source 
Conflicts:
	setup.py
This commit is contained in:
Karl Hobley 2014-04-22 09:59:32 +01:00
commit 2c35b863fb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
setup.py
View file

@ -44,7 +44,7 @@ setup(
"django-compressor>=1.3",
"django-libsass>=0.1",
"django-modelcluster>=0.1",
"django-taggit>=0.11.2",
"django-taggit==0.11.2",
"django-treebeard==2.0",
"Pillow>=2.3.0",
"beautifulsoup4>=4.3.2",