Saurabh 75d90b9d8f a[resolved] merge-conflicts

2018-09-20 13:28:23 +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

…

generators

fix(product-listing): fix variant selection in website

2018-08-16 09:22:45 +05:30

includes

Fixed merge conflict

2018-08-29 13:34:58 +05:30

pages

fix(product-listing): fix variant selection in website

2018-08-16 09:22:45 +05:30

print_formats/includes

lable for discount_amount should be configurable (#15408)

2018-09-17 11:06:49 +05:30

__init__.py

…

utils.py

…