summaryrefslogtreecommitdiffstats
path: root/browser
diff options
context:
space:
mode:
authorNew Tobin Paradigm <email@mattatobin.com>2018-04-20 07:32:32 -0400
committerGitHub <noreply@github.com>2018-04-20 07:32:32 -0400
commitae4be7c9eb5d2ac6094296b83704c333105aa5d7 (patch)
treefd710aa8b8a9299977e992d41c9118a358648fc7 /browser
parent0216b346f004c22603511ae9b0b35eaea26f1275 (diff)
parent6d04705a97e1f16b370ecf7c97508a46a650ff46 (diff)
downloadUXP-ae4be7c9eb5d2ac6094296b83704c333105aa5d7.tar
UXP-ae4be7c9eb5d2ac6094296b83704c333105aa5d7.tar.gz
UXP-ae4be7c9eb5d2ac6094296b83704c333105aa5d7.tar.lz
UXP-ae4be7c9eb5d2ac6094296b83704c333105aa5d7.tar.xz
UXP-ae4be7c9eb5d2ac6094296b83704c333105aa5d7.zip
Merge pull request #212 from janekptacijarabaci/profile_resseting_1
moebius#84, #205: Fix: The profile - resetting (partially)
Diffstat (limited to 'browser')
-rw-r--r--browser/components/migration/FirefoxProfileMigrator.js2
-rw-r--r--browser/components/migration/MigrationUtils.jsm1
2 files changed, 2 insertions, 1 deletions
diff --git a/browser/components/migration/FirefoxProfileMigrator.js b/browser/components/migration/FirefoxProfileMigrator.js
index 60ffcf627..2714cdbcd 100644
--- a/browser/components/migration/FirefoxProfileMigrator.js
+++ b/browser/components/migration/FirefoxProfileMigrator.js
@@ -7,7 +7,7 @@
"use strict";
/*
- * Migrates from a Firefox profile in a lossy manner in order to clean up a
+ * Migrates from a Basilisk profile in a lossy manner in order to clean up a
* user's profile. Data is only migrated where the benefits outweigh the
* potential problems caused by importing undesired/invalid configurations
* from the source profile.
diff --git a/browser/components/migration/MigrationUtils.jsm b/browser/components/migration/MigrationUtils.jsm
index 104efe005..e133ec520 100644
--- a/browser/components/migration/MigrationUtils.jsm
+++ b/browser/components/migration/MigrationUtils.jsm
@@ -726,6 +726,7 @@ this.MigrationUtils = Object.freeze({
"Internet Explorer": "ie",
"Microsoft Edge": "edge",
"Safari": "safari",
+ "Basilisk": "firefox",
"Firefox": "firefox",
"Nightly": "firefox",
"Google Chrome": "chrome", // Windows, Linux