Nabin Hait b2945fd5b5 Fixed merge conflict		2017-09-26 16:05:38 +05:30
..
activity	remove cal_heatmap	2017-09-12 11:34:15 +05:30
applications	Use six.moves.reload_module instead of reload	2017-09-04 16:05:57 +05:30
backups	Email designs (#3786)	2017-07-27 17:51:20 +05:30
chat	Email designs (#3786)	2017-07-27 17:51:20 +05:30
modules	[fix] notification filters, fixes frappe/erpnext#9982 (#3977)	2017-08-23 18:06:03 +05:30
setup_wizard	Fixed merge conflict	2017-09-26 16:05:38 +05:30
__init__.py	[refactor] fixes	2014-09-29 12:21:13 +05:30