Nabin Hait 4d22b6db30 Fixed Merge Conflict		2017-10-25 14:09:46 +05:30
..
emails	[Fix] Translation issue (#11323)	2017-10-25 12:38:17 +05:30
form_grid	[minor] fix ellipsis style	2016-11-02 07:34:17 +05:30
generators	Merge branch 'master' into develop	2017-05-23 12:04:06 +05:30
includes	Hub (#10934)	2017-10-05 11:17:30 +05:30
pages	[fix] ERPNext signup link fix on demo page (#10649)	2017-09-04 10:15:24 +05:30
print_formats/includes	Print Settings for printing taxes with zero amount (#10782)	2017-09-14 15:17:38 +05:30
__init__.py	Redesigned templates. Now all templates must be inside templates/pages templates/generators	2013-12-25 15:19:22 +05:30
utils.py	Python 3 compatibility syntax error fixes (#10519)	2017-08-28 18:17:36 +05:30