From: Javyer Der Derian <javier@tribalo.net>
Date: Thu, 17 Apr 2014 21:57:03 +0000 (-0300)
Subject: Merge pull request #44 from udacity/merge_small_prs
X-Git-Tag: live~25
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/9162dea1adb758b31ab40323d28ca585ed667eaf?hp=1157280cd8ff44da57a37dfc2f5920e53180f6b4

Merge pull request #44 from udacity/merge_small_prs

Merge small prs
---

diff --git a/forum_modules/robotstxt/urls.py b/forum_modules/robotstxt/urls.py
index 5f74a0a..ddcac3b 100644
--- a/forum_modules/robotstxt/urls.py
+++ b/forum_modules/robotstxt/urls.py
@@ -3,5 +3,5 @@ from django.http import  HttpResponse
 import settings
 
 urlpatterns = patterns('',
-    (r'^robots.txt$',  lambda r: HttpResponse(settings.ROBOTS_FILE.value)),
+    (r'^robots.txt$',  lambda r: HttpResponse(settings.ROBOTS_FILE.value, content_type='text/plain')),
 )