andela / ah-backend-thor

96%

develop: 88%

LAST BUILD ON BRANCH fix-heroku

branch: fix-heroku

CHANGE BRANCH

x

Reset

• fix-heroku
• bg-email-verification
• bg-email_verification_link
• bg-users-able-reset-password-161382392
• ch-add-CORS-162406976
• ch-add-username-to-login-response-162411097
• ch-add-username-to-loginResponse-162411097
• ch-descriptive-validation-errors-161382390
• ch-fix-coveralls-badge
• ch-fix-heroku
• ch-fix-heroku-2
• ch-put_keys
• ch-setup-deploy-heroku-161382384
• dependabot/pip/django-2.1.11
• develop
• fix-coveralls-report
• fix-search-articles-161382405
• fix-share-via-social-media
• ft-Enable-Social-login-161382393
• ft-Enable-Social-login-via-Google,-Facebook-and-Twitter
• ft-Enable-article-tagging-161382403
• ft-Enable-users-to-see-read-stats-161382414
• ft-Show-article-read-time
• ft-add-pagination-articles-161382404
• ft-bookmark-article-161382409
• ft-create-user-profile-161382394
• ft-document-api-using-swagger-161382387
• ft-favourite-article-161382400
• ft-like-dislike-comments-161382413
• ft-search-filtering-articles-161382405
• ft-setup-JWT-authentication-161382389
• ft-user-create-comments-161382397
• ft-user-like-articles-161382360
• ft-user-notifications-161382401
• ft-user-report-article-161382410
• ft-users-able-follow-each-other-161382399
• ft-users-able-rate-article-161382396
• ft-users-able-reset-password-161382392
• ft-users-able-share-articles-161382408
• ft-users-create-articles-161382395
• ft-users-like-articles-161382360

Fix merge conflicts