Anand Doshi 16ad50f641 Merge branch 'master' of github.com:webnotes/erpnext into unicode ...

Conflicts:
	erpnext/stock/doctype/item/item.txt

2012-08-07 15:07:56 +05:30

..

__init__.py

added unicode_literals import at start of each file

2012-07-19 13:40:31 +05:30

desktop.css

removed slider ui

2012-03-22 11:37:08 +05:30

desktop.html

desktop icons

2012-02-24 17:56:00 +05:30

desktop.js

updates to kb: unanswered questions show in desktop, questions query moved to server-side

2012-08-07 12:12:55 +05:30

desktop.txt

desktop: first cut

2012-02-24 15:29:07 +05:30