summaryrefslogtreecommitdiffstats
path: root/3rdparty
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-06-20 20:14:08 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-06-20 20:14:08 +0200
commit0f13cbb47daf46a2a2d121364529fd6082a74cc1 (patch)
tree1d108d87250f83bdf6e7258b4ce00cb8afecaea9 /3rdparty
parent572dd9fbade253c68f664e4706c57665b5322f43 (diff)
parentf255ac8b3a82bcf9e77c3bc0db7583d1492df44c (diff)
downloadnextcloud-server-0f13cbb47daf46a2a2d121364529fd6082a74cc1.tar.gz
nextcloud-server-0f13cbb47daf46a2a2d121364529fd6082a74cc1.zip
Merge branch 'master' into calendar_repeat
Diffstat (limited to '3rdparty')
-rw-r--r--3rdparty/fullcalendar/js/fullcalendar.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/3rdparty/fullcalendar/js/fullcalendar.js b/3rdparty/fullcalendar/js/fullcalendar.js
index 779a313c761..314f8c8a1a5 100644
--- a/3rdparty/fullcalendar/js/fullcalendar.js
+++ b/3rdparty/fullcalendar/js/fullcalendar.js
@@ -4662,7 +4662,7 @@ function DayEventRenderer() {
"</span>";
}
html +=
- "<span class='fc-event-title'>" + htmlEscape(event.title) + "</span>" +
+ "<span class='fc-event-title'>" + event.title + "</span>" +
"</div>";
if (seg.isEnd && isEventResizable(event)) {
html +=