Merge remote-tracking branch 'upstream/master' into moritzdietz/fix-typos-and-wording

diff --cc package.json
Simple merge

diff --cc public/index.html
index 85c015e72fe0f1be9a5c77305056c36395d9e90d,67a6a6a1ec1eda6a488bb36e89eeb0abfc57fc12..99bf04fc8dcc8b07a19d51f94d4bce9a916a4879
--- 1/public/index.html
--- 2/public/index.html
+++ b/public/index.html
@@@ -7,7 -7,8 +7,8 @@@
      <link href="https://api.fontshare.com/css?f[]=supreme@300,301,400,401,500,501,700,701&display=swap" rel="stylesheet">
      <title>Cinny</title>
      <meta name="name"        content="Cinny">
-     <meta name="description" content="Yet another Matrix client. Where you can enjoy the conversation using a simple, elegant and secure interface protected by e2ee with the power of open source.">
+     <meta name="author"      content="Ajay Bura">
 -    <meta name="description" content="Yet another matrix client. Where you can enjoy the conversation using simple, elegant and secure interface protected by e2ee with the power of open source.">
++    <meta name="description" content="Yet another Matrix client. Where you can enjoy the conversation using simple, elegant and secure interface protected by e2ee with the power of open source.">
      <meta name="keywords"    content="cinny, cinnyapp, cinnychat, matrix, matrix client, matrix.org, element">
    
      <meta property="og:title"       content="Cinny">