Nabin Hait 3893678326 fixed conflict while merging develop into v5.0		2014-12-31 14:32:17 +05:30
..
doctype	fixed conflict while merging develop into v5.0	2014-12-31 14:32:17 +05:30
__init__.py	[refactor] frappe.widgets > frappe.desk	2014-09-29 12:21:12 +05:30