Nabin Hait 8bf58367b8 Fixed merge conflict		2017-03-27 12:30:01 +05:30
..
css	[feature] ability to have variants based on manufacturer	2017-03-21 17:48:34 +01:00
images	[minor] fix notification for material request, splash icon, cleanup project form layout	2016-02-27 16:24:34 +05:30
js	Fixed merge conflict	2017-03-27 12:30:01 +05:30
less	[pos] ui fix for small screens frappe/erpnext#8029	2017-03-16 12:18:35 +05:30
build.json	UI changes	2017-03-10 17:00:41 +05:30