Merge remote-tracking branch 'upstream/master'

ezpublishlegacy · Aug 14, 2018 · 374e764 · 374e764
2 parents be7d488 + 84cf61b
commit 374e764
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -23,7 +23,7 @@ doctrine:
                 dbname: '%database_name%'
                 user: '%database_user%'
                 password: '%database_password%'
-                charset: UTF8
+                charset: utf8mb4
     orm:
         auto_generate_proxy_classes: '%kernel.debug%'
         naming_strategy: doctrine.orm.naming_strategy.underscore

diff --git a/app/config/dfs/dfs.yml b/app/config/dfs/dfs.yml
@@ -9,7 +9,7 @@ doctrine:
                 user: "%dfs_database_user%"
                 password: "%dfs_database_password%"
                 dbname: "%dfs_database_name%"
-                charset: UTF8
+                charset: utf8mb4
 
 # define the flysystem handler
 oneup_flysystem: