Saurabh 62a59301ef [fix] resolved merge conflicts		2018-05-15 13:02:40 +05:30
..
emails	rename to Subscription and transfer present Subscription records to Auto Repeat in frappe	2018-03-12 13:51:47 +01:00
form_grid	[minor] fix ellipsis style	2016-11-02 07:34:17 +05:30
generators	Add number spinner for quantity	2018-01-19 18:31:25 +01:00
includes	[fix] resolved merge conflicts	2018-05-15 13:02:40 +05:30
pages	Merge branch 'master' into develop	2018-05-02 14:48:10 +05:30
print_formats/includes	Update total.html (#12511)	2018-01-17 14:41: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	[enhance] Add Issue Type and Opportunity Type masters (#11598)	2017-11-16 17:03:52 +05:30