refactor: merge branch 'main' into refactor/monorepo

2021-09-16 22:24:21 +05:30
parent 36246da9e1 4e8a4e8914
commit 98b9660956
98 changed files with 3969 additions and 3007 deletions
--- a/packages/hoppscotch-app/locales/en.json
+++ b/packages/hoppscotch-app/locales/en.json
@@ -421,6 +421,7 @@
    "file_imported": "File imported",
    "finished_in": "Finished in {duration}ms",
    "history_deleted": "History deleted",
+    "linewrap": "Wrap lines",
    "loading": "Loading...",
    "none": "None",
    "nothing_found": "Nothing found for",