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

Conflicts:
	version.num
This commit is contained in:
Anand Doshi 2012-02-24 19:28:09 +05:30
commit d45ab64a85
2 changed files with 2 additions and 2 deletions

View File

@ -4,7 +4,7 @@
<h1>Support</h1>
<hr>
<div style="width: 48%; float: left;">
<h4><a ahref="#!List/Support Ticket">Support Ticket</a></h4>
<h4><a href="#!List/Support Ticket">Support Ticket</a></h4>
<p class="help">Support queries from customers via email or website</p>
<h4><a href="#!List/Customer Issue">Customer Issue</a></h4>
<p class="help">Customer Issue against a Serial No (warranty)</p>

View File

@ -1 +1 @@
698
698