Merge branch 'master' of https://github.com/ilvar/askbot-devel

Alex Andreev · Alex Andreev · commit d3efd41d61b8 · 2016-02-05T02:16:54.000+03:00
diff --git a/askbot/urls.py b/askbot/urls.py
@@ -731,3 +731,8 @@
             name='askbot_avatar_enable_default_avatar'
         )
     )
+
+if 'rosetta' in settings.INSTALLED_APPS:
+    urlpatterns += patterns('',
+        url(r'^rosetta/', include('rosetta.urls')),
+    )
diff --git a/askbot_requirements.txt b/askbot_requirements.txt
@@ -30,3 +30,5 @@ requirements-parser
 sanction==0.3.1
 simplejson
 unidecode
+
+django-rosetta

Original file line number	Diff line number	Diff line change
`@@ -731,3 +731,8 @@`
`731`	`731`	`name='askbot_avatar_enable_default_avatar'`
`732`	`732`	`)`
`733`	`733`	`)`
	`734`	`+`
	`735`	`+if 'rosetta' in settings.INSTALLED_APPS:`
	`736`	`+ urlpatterns += patterns('',`
	`737`	`+ url(r'^rosetta/', include('rosetta.urls')),`
	`738`	`+ )`