Update from parent 'origin/master' (conflicts)

Commit: fb358e8
Parent branch: origin/master
Forked at: 77de8b9

Author: cecton

cli/src/browser.rs

@@ -42,7 +42,7 @@ async fn start_inner(chain_spec: String, log_level: String) -> Result<Client, Bo
 	info!("  version {}", config.impl_version);
 	info!("  by Parity Technologies, 2017-2020");
 	info!("📋 Chain specification: {}", config.chain_spec.name());
-	info!("🏷 Node name: {}", config.network.node_name);
+	info!("🏷  Node name: {}", config.network.node_name);
 	info!("👤 Roles: {}", config.roles);
 
 	// Create the service. This is the most heavy initialization step.

cli/src/command.rs

@@ -64,7 +64,7 @@ pub fn run() -> Result<()> {
 			};
 
 			if is_kusama {
-				info!("⛓ Native runtime: {}", service::KusamaExecutor::native_version().runtime_version);
+				info!("⛓  Native runtime: {}", service::KusamaExecutor::native_version().runtime_version);
 				info!("----------------------------");
 				info!("This chain is not in any way");
 				info!("      endorsed by the       ");
@@ -77,7 +77,7 @@ pub fn run() -> Result<()> {
 					service::kusama_runtime::UncheckedExtrinsic,
 				>(runtime, authority_discovery_enabled, grandpa_pause)
 			} else {
-				info!("⛓ Native runtime: {}", service::PolkadotExecutor::native_version().runtime_version);
+				info!("⛓  Native runtime: {}", service::PolkadotExecutor::native_version().runtime_version);
 
 				run_node::<
 					service::polkadot_runtime::RuntimeApi,