Merge branch 'mercury' of https://github.com/kvhnuke/etherwallet into…

… mercury
MyEtherWallet · Aug 15, 2016 · 3eef710 · 3eef710
2 parents 1cd6663 + f4de39a
commit 3eef710
Show file tree

Hide file tree

Showing 11 changed files with 20,767 additions and 17,015 deletions.
diff --git a/app/includes/header.tpl b/app/includes/header.tpl
@@ -29,7 +29,7 @@
 </head>
 
 <body>
-
+<span class="announcement annoucement-warning" style="display:block;">Always check the URL before accessing your wallet or creating a new wallet. Beware of phishing sites!</span>
 @@if (site === 'mew' ) {
   <header class="container-fluid bg-gradient text-white">
     <section class="container">

diff --git a/chrome-extension/cx-wallet.html b/chrome-extension/cx-wallet.html
@@ -29,7 +29,7 @@
 </head>
 
 <body>
-
+<span class="announcement annoucement-warning" style="display:block;">Always check the URL before accessing your wallet or creating a new wallet. Beware of phishing sites!</span>
 
 
 

diff --git a/chrome-extension/index.html b/chrome-extension/index.html
@@ -29,7 +29,7 @@
 </head>
 
 <body>
-
+<span class="announcement annoucement-warning" style="display:block;">Always check the URL before accessing your wallet or creating a new wallet. Beware of phishing sites!</span>
 
   <header class="container-fluid bg-gradient text-white">
     <section class="container">
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,7 +29,7 @@
		</head>

		<body>

		<span class="announcement annoucement-warning" style="display:block;">Always check the URL before accessing your wallet or creating a new wallet. Beware of phishing sites!</span>



Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ @@
     </head>
     <body>
+    <span class="announcement annoucement-warning" style="display:block;">Always check the URL before accessing your wallet or creating a new wallet. Beware of phishing sites!</span>
       <header class="container-fluid bg-gradient text-white">
         <section class="container">
@@ Expand Down @@