Merge branch '5.2' into 5.x

wouterj · wouterj · commit d4277ecbfa89 · 2020-12-06T12:07:29.000+01:00
* 5.2:
  Prefer sass over node-sass
  Add Titouan in the core team
diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst
@@ -71,7 +71,8 @@ Active Core Members
   * **Tobias Nyholm** (`Nyholm`_);
   * **Wouter De Jong** (`wouterj`_);
   * **Alexander M. Turek** (`derrabus`_);
-  * **Jérémy Derussé** (`jderusse`_).
+  * **Jérémy Derussé** (`jderusse`_);
+  * **Titouan Galopin** (`tgalopin`_).
 
 * **Security Team** (``@symfony/security`` on GitHub):
 
@@ -207,3 +208,4 @@ discretion of the **Project Leader**.
 .. _`lsmith77`: https://github.com/lsmith77/
 .. _`derrabus`: https://github.com/derrabus/
 .. _`jderusse`: https://github.com/jderusse/
+.. _`tgalopin`: https://github.com/tgalopin/
diff --git a/frontend/encore/simple-example.rst b/frontend/encore/simple-example.rst
@@ -311,15 +311,15 @@ Encore. When you do, you'll see an error!
 
 .. code-block:: terminal
 
-    >   Error: Install sass-loader & node-sass to use enableSassLoader()
-    >     yarn add sass-loader@^8.0.0 node-sass --dev
+    >   Error: Install sass-loader & sass to use enableSassLoader()
+    >     yarn add sass-loader@^10.0.0 sass --dev
 
 Encore supports many features. But, instead of forcing all of them on you, when
 you need a feature, Encore will tell you what you need to install. Run:
 
 .. code-block:: terminal
 
-    $ yarn add sass-loader@^8.0.0 node-sass --dev
+    $ yarn add sass-loader@^10.0.0 sass --dev
     $ yarn encore dev --watch
 
 Your app now supports Sass. Encore also supports LESS and Stylus. See
