Merge remote-tracking branch 'origin/staging' into develop

Author: niwinz

CHANGES.md

@@ -42,13 +42,15 @@ on [its own changelog](library/CHANGES.md)
 - Fix font size input not displaying "mixed" when multiple texts are selected [Taiga #11177](https://tree.taiga.io/project/penpot/issue/11177)
 
 
-## 2.7.2 (Unreleased)
+## 2.7.2
 
 ### :bug: Bugs fixed
 
 - Update plugins runtime [Github #6604](https://github.com/penpot/penpot/pull/6604)
 - Backport from develop a minor fix that enables import of files
   generated by penpot library [Github #6614](https://github.com/penpot/penpot/pull/6614)
+- Fix copy in error message [GitHub #6615](https://github.com/penpot/penpot/pull/6615)
+- Fix url on invitation link [Taiga #11284](https://tree.taiga.io/project/penpot/issue/11284)
 
 
 ## 2.7.1

backend/resources/app/email/request-file-access/en.txt

@@ -13,7 +13,7 @@ This will automatically include {{requested-by|abbreviate:25}} in the team, so t
 
 Click the link below to provide team access:
 
-{{ public-uri }}/#/dashboard/members?team-id{{team-id}}&invite-email={{requested-by-email|urlescape}}
+{{ public-uri }}/#/dashboard/members?team-id={{team-id}}&invite-email={{requested-by-email|urlescape}}
 
 
 

frontend/translations/en.po

@@ -7267,9 +7267,9 @@ msgstr "Invalid color value: %s"
 msgid "workspace.tokens.invalid-json"
 msgstr "Import Error: Invalid token data in JSON."
 
-#: src/app/main/data/workspace/tokens/errors.cljs:23
+#: src/app/main/ui/workspace/tokens/errors.cljs:16
 msgid "workspace.tokens.invalid-json-token-name"
-msgstr "Import Error: Invalid token name in in JSON."
+msgstr "Import Error: Invalid token name in JSON."
 
 #: src/app/main/data/workspace/tokens/errors.cljs:24
 msgid "workspace.tokens.invalid-json-token-name-detail"