Merge branch 'develop' into fix-implicit-fallthrough
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
This commit is contained in:
		| @@ -336,13 +336,13 @@ QVariant AccountList::data(const QModelIndex &index, int role) const | ||||
|  | ||||
|             case MigrationColumn: { | ||||
|                 if(account->isMSA() || account->isOffline()) { | ||||
|                     return tr("N/A", "Can Migrate?"); | ||||
|                     return tr("N/A", "Can Migrate"); | ||||
|                 } | ||||
|                 if (account->canMigrate()) { | ||||
|                     return tr("Yes", "Can Migrate?"); | ||||
|                     return tr("Yes", "Can Migrate"); | ||||
|                 } | ||||
|                 else { | ||||
|                     return tr("No", "Can Migrate?"); | ||||
|                     return tr("No", "Can Migrate"); | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 PandaNinjas
					PandaNinjas