Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename

This commit is contained in:
Anand Doshi
2012-05-04 13:05:36 +05:30
12 changed files with 74 additions and 79 deletions

View File

@@ -879,7 +879,7 @@ wn.provide('erpnext.navbar');erpnext.navbar.Navbar=Class.extend({init:function()
</ul>\
<img src="lib/images/ui/spinner.gif" id="spinner"/>\
<ul class="nav pull-right">\
<li id="#login-topbar-item"><a href="#!Login Page">Login</a></li>\
<li id="login-topbar-item"><a href="#!Login Page">Login</a></li>\
</ul>\
</div>\
</div>\