andela / hc-wits-kla

81%

develop: 85%

LAST BUILD ON BRANCH ft-allocate-alerts-158175318

branch: ft-allocate-alerts-158175318

CHANGE BRANCH

x

Reset

• ft-allocate-alerts-158175318
• bg-nag-interval-display
• ch-accounts-tests-158175310
• ch-apitests
• ch-configure-emails-and-base-url-158865786
• ch-continuos-integration-158456314
• ch-ensure-triggers-alerts-159165376
• ch-fix-deployment-159005888
• ch-front-test_fixing-158175308
• ch-heroku-deployment-158458729
• ch-update-readme-158548426
• dependabot/pip/cryptography-3.2
• dependabot/pip/django-1.11.28
• dependabot/pip/django-1.11.29
• dependabot/pip/lxml-4.6.2
• dependabot/pip/lxml-4.6.3
• dependabot/pip/urllib3-1.26.5
• develop
• ft-allocate-jobs-158175318
• ft-blog-158175324
• ft-configure-periodic-reports-158175312
• ft-create-tasks-checks-info-158175327
• ft-extend-set-timeouts-158175315
• ft-landingpage-rework-158175328
• ft-nag-user-158175313
• ft-onboarding-content-158175321
• ft-schedule-standard-tasks
• ft-set-different-priorities-158175322
• ft-sms-telegram-158175317
• ft-unresolved-jobs-158175314
• ft-user-priority-list
• ft-user_notification-158175316

resolve merge conflicts