Merge branch 'master' into develop

2016-05-06 16:13:35 +05:30
parent b35abf1125 80c02640a1
commit 332d29f166
13 changed files with 151 additions and 52 deletions
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -15,6 +15,7 @@ $(document).bind('toolbar_setup', function() {
 			frappe.urllib.get_base_url()+'/assets/erpnext/images/erp-icon.svg" />');

 	$('[data-link="docs"]').attr("href", "https://manual.erpnext.com")
+	$('[data-link="issues"]').attr("href", "https://github.com/frappe/erpnext/issues")
 });

 // doctypes created via tree