Merge branch 'develop' into 'master'

Update master

See merge request pleroma/pleroma-fe!646

1 files changed, 1 insertions, 1 deletions

diff --git a/.eslintrc.js b/.eslintrc.js
index 8e6549e5..800f9a4f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -11,7 +11,7 @@ module.exports = {
     'html'
   ],
   // add your custom rules here
-  'rules': {
+  rules: {
     // allow paren-less arrow functions
     'arrow-parens': 0,
     // allow async-await