Nabin Hait b2945fd5b5 Fixed merge conflict		2017-09-26 16:05:38 +05:30
..
frappe	Fixed merge conflict	2017-09-26 16:05:38 +05:30
integrations	GSuite integration (#3252)	2017-06-13 14:55:07 +05:30
legacy	[fix] dirty for text editor and use emoji for desktop icon	2017-09-20 11:54:23 +05:30
lib	[remove] socket.io client	2017-09-14 13:07:29 +05:30
docs.js	comment out offcanvas related code	2016-07-20 13:27:48 +05:30