Commit 27837f32f85d9ab9d6c4f7fa9530ca1080417011

Authored by Matheus Figueiredo
2 parents 18f71f04 dd5042f4

Merge branch 'master' into bootstrap

Showing 1 changed file with 3 additions and 1 deletions   Show diff stats
requirements.txt
@@ -25,7 +25,9 @@ git+https://github.com/TracyWebTech/django-conversejs @@ -25,7 +25,9 @@ git+https://github.com/TracyWebTech/django-conversejs
25 # Feedzilla (planet) and deps 25 # Feedzilla (planet) and deps
26 https://bitbucket.org/lorien/feedzilla/get/tip.tar.gz # Temporarily work around 26 https://bitbucket.org/lorien/feedzilla/get/tip.tar.gz # Temporarily work around
27 django-common 27 django-common
28 -django-tagging 28 +django-taggit
  29 +django-taggit-templatetags
29 feedparser 30 feedparser
30 lxml 31 lxml
31 grab 32 grab
  33 +transliterate