Nabin Hait a3cd960eed fixed version conflict		2016-12-20 11:35:28 +05:30
..
doctype	fixed version conflict	2016-12-20 11:35:28 +05:30
__init__.py	Moved Backup Manager and Social Login keys to the new Integrations Module, prepared frappe for Mandrill Integration	2015-08-11 12:03:13 +05:30