aboutsummaryrefslogtreecommitdiffstats
path: root/library/fullcalendar/gcal.js
diff options
context:
space:
mode:
authorPaolo Tacconi <p.tacconi@giunti.it>2016-04-15 09:20:58 +0200
committerPaolo Tacconi <p.tacconi@giunti.it>2016-04-15 09:20:58 +0200
commit45a854762b451dafb882bc56efce054b64420627 (patch)
tree958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /library/fullcalendar/gcal.js
parent1806da0851dd5cf5978b19d12783ae3101a11257 (diff)
parenta29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff)
downloadvolse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz
volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2
volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'library/fullcalendar/gcal.js')
-rw-r--r--library/fullcalendar/gcal.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/fullcalendar/gcal.js b/library/fullcalendar/gcal.js
index 8dc96fa14..98174ecb0 100644
--- a/library/fullcalendar/gcal.js
+++ b/library/fullcalendar/gcal.js
@@ -1,5 +1,5 @@
/*!
- * FullCalendar v2.5.0-beta Google Calendar Plugin
+ * FullCalendar v2.6.1 Google Calendar Plugin
* Docs & License: http://fullcalendar.io/
* (c) 2015 Adam Shaw
*/