Nabin Hait 34c551d9a5 fix: Missing commits from hotfix branch (#17997) ... * fix: merge conflict * fix: restored missing set_gst_state_and_state_number function * fix: style linting as per codacy * fix: Fixes related to customer/lead merging * fix: merge conflict * fix: Fixes related to customer/lead merging * fix: Assign isue/opportunity to user * fix: Assign isue/opportunity to user * fix: Replaced Invoice type by GST Category * fix: merge conflict * fix: merge conflict * fix: test cases * fix: test cases		2019-07-03 10:34:31 +05:30
..
css	Merge branch 'master' into staging-fixes	2018-11-28 08:12:48 +00:00
images	fix(readme): logo	2019-05-21 11:57:33 +05:30
js	fix: Missing commits from hotfix branch (#17997)	2019-07-03 10:34:31 +05:30
less	fix: Missing commits from hotfix branch (#17997)	2019-07-03 10:34:31 +05:30
scss	Website: Product Configurator and Bootstrap 4 (#15965)	2019-03-19 11:48:32 +05:30
sounds	feat: Add call sound effects	2019-06-07 12:48:13 +05:30
.gitignore	fix(node_modules): remove hardcoded symlink (#16975)	2019-04-05 00:12:26 +05:30
build.json	fix: Missing commits from hotfix branch (#17997)	2019-07-03 10:34:31 +05:30