migration.sql
phpMerge branch 'staging' of github.com:itdoors/sd into staging
fixes
Merge branch 'staging' of github.com:itdoors/sd into staging

Conflicts:
	app/migration.sql
migration.sql
Merge branch 'staging' of github.com:itdoors/sd into staging
#call-btn
#call-btn
Merge branch 'task-sipml' into staging
invoice
invoice
invoice
invoice
invoice
Merge branch 'staging' of github.com:itdoors/sd into staging
task-766-invoice-edit
task-766-invoice-edit
task-766-invoice-edit
task-766-invoice-edit
task-766-invoice-edit