File: //home/arjun/projects/buyercall/.git/MERGE_MSG
Merge branch 'merge/develop_forms-ui-spericorn' of https://bitbucket.org/kakedis/buyercall into merge/develop_forms-ui-spericorn
# Conflicts:
# .gitignore
# Dockerfile.dev
# Dockerfile.prod
# bitbucket-pipelines.yml
# buyercall/app.py
# buyercall/assets/components/leads/leads_dashboard.js
# buyercall/assets/scripts/forms_backend_edit.js
# buyercall/blueprints/activity/models.py
# buyercall/blueprints/admin/templates/admin/_menu.jinja2
# buyercall/blueprints/api2/doc/endpoints/accounts.py
# buyercall/blueprints/api2/doc/endpoints/adf.py
# buyercall/blueprints/api2/doc/endpoints/credit_checks.py
# buyercall/blueprints/api2/doc/endpoints/form_leads.py
# buyercall/blueprints/api2/doc/serializers.py
# buyercall/blueprints/contacts/contact_tasks.py
# buyercall/blueprints/contacts/models.py
# buyercall/blueprints/contacts/views.py
# buyercall/blueprints/form_leads/form_tasks.py
# buyercall/blueprints/form_leads/models.py
# buyercall/blueprints/form_leads/templates/form_edit.jinja2
# buyercall/blueprints/form_leads/templates/lead_form_pdf.html
# buyercall/blueprints/form_leads/views.py
# buyercall/blueprints/leads/models.py
# buyercall/blueprints/leads/templates/leads/leads.jinja2
# buyercall/blueprints/mobile/mobile_inbound_call.py
# buyercall/blueprints/mobile/tasks.py
# buyercall/blueprints/mobile/utils.py
# buyercall/blueprints/partnership/models.py
# buyercall/blueprints/partnership/templates/accounts/index.jinja2
# buyercall/blueprints/partnership/templates/partnership/signup.jinja2
# buyercall/blueprints/partnership/views.py
# buyercall/blueprints/phonenumbers/bw_inbound.py
# buyercall/blueprints/phonenumbers/bw_operational.py
# buyercall/blueprints/phonenumbers/twilio_inbound.py
# buyercall/blueprints/phonenumbers/views.py
# buyercall/blueprints/reports/tasks.py
# buyercall/blueprints/reports/templates/credit_service_provider_report_pdf.html
# buyercall/blueprints/reports/views.py
# buyercall/blueprints/sms/bw_sms_inbound.py
# buyercall/blueprints/sms/models.py
# buyercall/blueprints/sysadmin/views.py
# buyercall/blueprints/user/forms.py
# buyercall/blueprints/user/models.py
# buyercall/blueprints/user/tasks.py
# buyercall/blueprints/user/templates/user/login.jinja2
# buyercall/blueprints/user/templates/user/password_reset.jinja2
# buyercall/blueprints/user/templates/user/signup.jinja2
# buyercall/blueprints/user/templates/user/tos.jinja2
# buyercall/blueprints/user/templates/user/two_factor_auth.jinja2
# buyercall/blueprints/user/templates/user/two_factor_auth_onboarding.jinja2
# buyercall/blueprints/user/views.py
# buyercall/blueprints/widgets/bw_outbound.py
# buyercall/blueprints/widgets/views.py
# buyercall/extensions.py
# buyercall/lib/supervisor_manager.py
# buyercall/lib/util_boto3_s3.py
# buyercall/lib/util_crypto.py
# buyercall/lib/util_ses_email.py
# buyercall/lib/util_twilio.py
# buyercall/lib/util_two_factor_auth.py
# buyercall/register.py
# buyercall/templates/layouts/backend_base.jinja2
# buyercall/templates/layouts/login.jinja2
# buyercall/templates/layouts/login_base.jinja2
# buyercall/templates/layouts/verification.jinja2
# buyercall/templates/macros/layout/assets.jinja2
# config/settings.py
# docker-compose.yml
# nginx/configs/default.conf
# package-lock.json
# package.json
# requirements.txt