root 5e8c91d79e Merge branch 'master' of https://github.com/webnotes/erpnext ...

Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py
	setup/doctype/backup_manager/backup_manager.py

2013-03-18 15:08:37 +05:30

..

doctype

Merge branch 'master' of https://github.com/webnotes/erpnext

2013-03-18 15:08:37 +05:30

locale

updated language and separated slickgrid files

2013-02-25 11:05:27 +05:30

page

fix in about

2013-03-12 14:59:46 +05:30

__init__.py

install from txt files, part 1

2013-01-16 17:48:17 +05:30

utils.py

fixes in price list currency

2013-02-28 18:41:49 +05:30