7 commits

Author	SHA1	Message	Date
Revant Nandgaonkar	0f03713e5c	fix: erpnext nginx image install_app script	2020-03-07 16:45:53 +05:30
Revant Nandgaonkar	e5a5a05dfb	fix: erpnext nginx image build	2020-03-07 15:47:50 +05:30
Revant Nandgaonkar	d00770e42f	fix: install_app set branch	2020-03-07 05:33:32 +05:30
chabad360	7bdd329793	some small changes	2020-03-06 06:23:53 +00:00
chabad360	1c513f9e41	Merge remote-tracking branch 'upstream/develop' into install_app	2020-03-06 06:21:07 +00:00
Revant Nandgaonkar	6782decfc6	fix: resolve travis yml conflicts ... use travis.py	2020-03-05 12:05:32 +05:30
Davide Bortolami	6f7a9b92ac	Refactor renaming erpnext-assets and frappe-assets to erpnext-nginx and frappe-nginx	2020-03-03 23:40:11 +00:00