Merge branch 'master' into develop

contao · Sep 12, 2018 · f2904d8 · f2904d8
2 parents 6e90552 + 82e5c48
commit f2904d8
Show file tree

Hide file tree

Showing 3 changed files with 595 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "description": "Contao Official Demo",
     "license": "CC-BY-SA-4.0",
     "require": {
-        "contao/core-bundle":"~4.5",
+        "contao/core-bundle":"~4.6.3",
         "contao-community-alliance/composer-plugin":"~3.0"
     },
     "replace": {
@@ -14,7 +14,7 @@
         "contao": {
             "sources": {
                 "src/files/contaodemo": "files/contaodemo",
-                "src/templates/codv4.1.0_contao_4.5.8.sql": "templates/codv4.1.0_contao_4.5.8.sql",
+                "src/templates/codv4.2.0_contao_4.6.3.sql": "templates/codv4.2.0_contao_4.6.3.sql",
                 "src/templates/contaodemo": "templates/contaodemo"
             }
         }

diff --git a/contents/Modules/events.md b/contents/Modules/events.md
@@ -4,7 +4,7 @@ Page: Modules | Events
 
 Here are some examples on how the calendar modules can be used. You can either use a big calendar view, a mini-calender as shown on the left side below the vertical navigation or an event-list shown at the bottom of the page. All of those offer you different options of with what, where, when and how to display the calendar.
 
-To see some actual calendar entries click here to go to March 2013.
+To see some actual calendar entries click here to go to May 2013.
 
 ## List all events