Merge pull request #299 from Eric-Guo/master

login original match with current spree master (3.1.0.beta)
spree · Sep 28, 2015 · 50f60a7 · 50f60a7
2 parents 8f3258f + ba7a181
commit 50f60a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/overrides/auth_shared_login_bar.rb b/app/overrides/auth_shared_login_bar.rb
@@ -2,6 +2,6 @@
                      :name => "auth_shared_login_bar",
                      :insert_before => "li#search-bar",
                      :partial => "spree/shared/login_bar",
-                     :disabled => false, 
-                     :original => 'eb3fa668cd98b6a1c75c36420ef1b238a1fc55ac')
+                     :disabled => false,
+                     :original => 'c00d67dfc0496d21a351b48c41a728412cb5ed2c')
 
diff --git a/app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface b/app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface
@@ -1,4 +1,4 @@
 <!-- insert_top "[data-hook='admin_login_navigation_bar'], #admin_login_navigation_bar[data-hook]"
-     original '841227d0aedf7909d62237d8778df99100087715' -->
+     original '71d12ae155143c6ea8090942955299485f534153' -->
 
 <%= render partial: "spree/layouts/admin/login_nav" %>