Merge branch 'master' into limit-snippet-characters

jsolly · Nov 10, 2023 · 338942f · 338942f
2 parents be4ed71 + c2ce85e
commit 338942f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/app/app/settings/docker_dev.py b/app/app/settings/docker_dev.py
@@ -10,4 +10,3 @@
 SECURE_SSL_REDIRECT = False
 SECURE_BROWSER_XSS_FILTER = False
 SECURE_CONTENT_TYPE_NOSNIFF = False
-
diff --git a/app/tests/test_views.py b/app/tests/test_views.py
@@ -187,7 +187,7 @@ def test_update_post_view(self):
             "content": "Long ago, the four nations lived together in harmony. Then everything changed when the fire nation attacked.",
             "metaimg_alt_txt": "Meta Image Alt-Text Update",
             # date_posted : ""
-            "author": self.admin_user
+            "author": self.admin_user,
             # "likes"
             # "views"
         }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,3 @@
		SECURE_SSL_REDIRECT = False
		SECURE_BROWSER_XSS_FILTER = False
		SECURE_CONTENT_TYPE_NOSNIFF = False