Permalink
Browse files

Merge branch 'master' of github.com:ImaginationForPeople/imaginationf…

…orpeople
  • Loading branch information...
glibersat committed Apr 8, 2013
2 parents 307b138 + da5867f commit 413dfedda36f8e2aa319a6ae3f6c9cac1532a30d
Showing with 4 additions and 2 deletions.
  1. +3 −1 requirements.txt
  2. +1 −1 settings.py
View
@@ -69,7 +69,9 @@ django_compressor==1.2
-e hg+https://bitbucket.org/atiberghien/django-licenses@365f65fa7148312372783af370e37f80bd3787d5#egg=django-licenses
-e git+https://github.com/ImaginationForPeople/django-oembed-works#egg=django-oembed-works
-django-userena==1.2.0
+#django-userena==1.2.0
+#Recent snapshot, fixes missing messages
+-e git://github.com/bread-and-pepper/django-userena.git@13edb3cd5613cc022d5f887f734b36f0e3c7256c#egg=django-userena
django-social-auth==0.6.9
-e git+https://github.com/jorgebastida/django-dajaxice.git@d5a70654fbcd7241fbdfaf5a89fea2746cd25369#egg=django-dajaxice
View
@@ -61,7 +61,7 @@
('de', u'Deutsch'),
('it', u'Italiano'),
('ru', u'Русский'),
- ('zh', u'中文'),
+ ('zh-cn', u'中文'),
)
# If you set this to False, Django will make some optimizations so as not

0 comments on commit 413dfed

Please sign in to comment.