Nabin Hait fe3529b194 fix: merge conflict		2021-03-11 16:45:41 +05:30
..
emails	fix: Use abbr method for abbr	2021-01-21 16:47:04 +05:30
form_grid	[minor] fix ellipsis style	2016-11-02 07:34:17 +05:30
generators	fix: merge conflict	2021-03-11 16:45:41 +05:30
includes	fix: merge conflict	2021-03-11 16:45:41 +05:30
pages	fix: merge conflict	2021-03-11 16:45:41 +05:30
print_formats/includes	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-12-11 12:57:04 +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	fix: Missing commits from hotfix branch (#17997)	2019-07-03 10:34:31 +05:30