andela / ah-maps

86%

master: 93%

LAST BUILD ON BRANCH ft-users-receive-jwt-successful-161255238

branch: ft-users-receive-jwt-successful-161255238

CHANGE BRANCH

x

Reset

• ft-users-receive-jwt-successful-161255238
• bg-create-article-161255244
• bg-fix-comment-on-article-161255246
• bg-fix-jwt-authentication-161255238
• bg-fix-registartion-161255239
• bg-fix-registration-161255239
• bg-reset-password-email
• bg-reset-password-validation-161704324
• bug-deploy-to-heroku-161255234
• ch-add-boolean-values-for-like-dislike-161255247
• ch-codeclimate-161255235
• ch-configure-cors-161255226
• ch-write-tests-161255220
• develop
• fix-refactor-profiles-161255243
• fix-refactor-registration-161255239
• ft-article-reading-time
• ft-change-password-161255241
• ft-comment-history-161255263
• ft-create-article-161255244
• ft-create-articles-161255244
• ft-create-user-profile-161255243
• ft-custom-filtering-and-search-161255256
• ft-email-confirmation-161255240
• ft-enable-social-login-161255242
• ft-favorite-articles-161255249
• ft-integrate-cloudinary
• ft-like-comments-161255264
• ft-liking-unliking-articles-161255247
• ft-list-all-users
• ft-pagination-response
• ft-pagination-response-161255254
• ft-rate-an-article
• ft-registration-validation-161255239
• ft-report-an-article
• ft-resend-email-confirmation
• ft-share-articles
• ft-swagger-documentation-161255237
• ft-tag-articles-161255253
• ft-users-able-comment-articles-161255246
• ft-users-can-bookmark-articles-161255259
• ft-users-can-highlight-and-comment-on-text-in-articles-161255262
• ft-users-can-track-reading-stats-161255265
• ft-users-follow-each-other-161255248
• ft-users-receive-notifications-161255251
• refactor-code-follow-feature
• revert-40-ft-tag-articles-161255253

fix conflict