Merge branch 'master' into feature/env-manager

2020-02-23 11:39:44 -05:00
parent 15dc0ad9ac f690ea01c4
commit 59ca8cb2c6
18 changed files with 465 additions and 126 deletions
--- a/lang/en-US.js
+++ b/lang/en-US.js
@@ -230,6 +230,7 @@ export default {
  payload: "Payload",
  choose_file: "Choose a file",
  file_imported: "File imported",
+  import_failed: "Import failed",
  f12_details: "(F12 for details)",
  we_use_cookies: "We use cookies",
  copied_to_clipboard: "Copied to clipboard",