Update to Drupal 8.4.0. For more information, see https://www.drupal.…

…org/project/drupal/releases/8.4.0
pranav45 · Oct 4, 2017 · 7ee457d · 7ee457d
1 parent 642f046
commit 7ee457d
Show file tree

Hide file tree

Showing 3,820 changed files with 121,738 additions and 66,971 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -13,5 +13,5 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[composer.json]
+[composer.{json,lock}]
 indent_size = 4
diff --git a/.eslintignore b/.eslintignore
@@ -1,5 +1,4 @@
-core/assets/vendor/**/*
-core/modules/locale/tests/locale_test.js
+core/**/*
 vendor/**/*
 sites/**/files/**/*
 libraries/**/*

diff --git a/.gitattributes b/.gitattributes
@@ -45,13 +45,17 @@
 # Define binary file attributes.
 # - Do not treat them as text.
 # - Include binary diff in patches instead of "binary files differ."
+*.eot     -text diff
+*.exe     -text diff
 *.gif     -text diff
 *.gz      -text diff
 *.ico     -text diff
 *.jpeg    -text diff
 *.jpg     -text diff
-*.png     -text diff
+*.otf     -text diff
 *.phar    -text diff
-*.exe     -text diff
+*.png     -text diff
 *.svgz    -text diff
 *.ttf     -text diff
+*.woff    -text diff
+*.woff2   -text diff
diff --git a/composer.json b/composer.json
@@ -5,10 +5,10 @@
     "license": "GPL-2.0+",
     "require": {
         "composer/installers": "^1.0.24",
-        "wikimedia/composer-merge-plugin": "~1.4"
+        "wikimedia/composer-merge-plugin": "^1.4"
     },
     "replace": {
-        "drupal/core": "~8.3"
+        "drupal/core": "^8.4"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,