Commit Graph

3 Commits

Author SHA1 Message Date
Anand Doshi
05aaae33ae Merge branch 'master' of github.com:webnotes/erpnext into 1209
Conflicts:
	accounts/doctype/account/account.py
	erpnext/accounts/doctype/journal_voucher/journal_voucher.py
	patches/patch_list.py
	startup/event_handlers.py
2012-10-02 14:35:20 +05:30
Anand Doshi
3c4238fc9c Merge branch 'master' of github.com:webnotes/erpnext into 1209
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
2012-09-26 12:24:28 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30