8000 Merge branch 'master' into release · pythonanywhere/pythondotorg@50cd46b · GitHub
[go: up one dir, main page]
Skip to content

Commit 50cd46b

Browse files
frankwilesfrankwiles
committed
Merge branch 'master' into release
2 parents 86577e6 + 7415f82 commit 50cd46b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ static-root
1414
/static/stylesheets/no-mq.css
1515
/static/stylesheets/style.css
1616
tmp/*
17+
media/*
18+
pydotorg/settings/mylocal.py

‎events/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class Event(ContentManageable):
9494
title = models.CharField(max_length=200)
9595
calendar = models.ForeignKey(Calendar, related_name='events')
9696

97-
description = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE, escape_html=True)
97+
description = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE, escape_html=False)
9898
venue = models.ForeignKey(EventLocation, null=True, blank=True, related_name='events')
9999

100100
categories = models.ManyToManyField(EventCategory, related_name='events', blank=True, null=True)

0 commit comments

Comments
 (0)
0