nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-24 12:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into latest

Browse Source 
Conflicts:
	erpnext/setup/doctype/notification_control/notification_control.js
	index.html
	version.num
This commit is contained in:
Anand Doshi
2012-01-25 17:21:14 +05:30
parent 6be842f960 46848a48fe
commit 6e174cc2c4
12 changed files with 73 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
version.num
View File

@@ -1 +1 @@
169
169