Merge branch 'master' into develop

contao · Sep 19, 2018 · 7368cac · 7368cac
2 parents 4d5338e + a084560
commit 7368cac
Show file tree

Hide file tree

Showing 3 changed files with 594 additions and 2 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.6.3",
+        "contao/core-bundle":"~4.6.4",
         "contao-community-alliance/composer-plugin":"~3.0"
     },
     "replace": {
@@ -14,7 +14,7 @@
         "contao": {
             "sources": {
                 "src/files/contaodemo": "files/contaodemo",
-                "src/templates/codv4.2.0_contao_4.6.3.sql": "templates/codv4.2.0_contao_4.6.3.sql",
+                "src/templates/codv4.2.2_contao_4.6.4.sql": "templates/codv4.2.2_contao_4.6.4.sql",
                 "src/templates/contaodemo": "templates/contaodemo"
             }
         }

diff --git a/src/files/contaodemo/contao_official_demo.cto b/src/files/contaodemo/contao_official_demo.cto