nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 22:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	index.html
	version.num
This commit is contained in:
Anand Doshi
2012-01-18 12:33:16 +05:30
parent 165fe9e122 88ba7b86dc
commit a7d632db99
8 changed files with 48 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -2,6 +2,7 @@
*.comp.js
.DS_Store
server_tools
user_files
patch.log
lib
versions-local.db