andela / phlox-ah

89%

master: 75%

LAST BUILD ON BRANCH feature/160451512/article-read-time

branch: feature/160451512/article-read-time

CHANGE BRANCH

x

Reset

• feature/160451512/article-read-time
• chore/160451494/integrate-coveralls
• staging
• feature/160451496/signup-jwt
• feature/160451501/user-profile
• feature/160451498/vaidate-user-signup
• feature/160451502/create-articles
• feature/160451497/verification-email
• feature/160451496/userLogin-jwt
• feature/160451499/user-reset-password
• feature/160451504/article-comment
• feature/160451503/rate-articles
• feature/160451495/swagger-documentation
• feature/160451500/facebook-google-login
• feature/160451505/like-dislike-articles
• feature/160451506/user-following
• revert-21-feature/160451506/user-following
• test
• feature/160451508/tag-articles
• feature/160451500/login-twitter
• feature/160451510/list-users
• bug/161178627/user-profile
• feature/160451515/bookmark-articles
• feature/160451509/article-pagination
• feature/161141274/check-user-verification
• ft/160451507/email-notifications
• feature/160451511/search-functionality
• ft/160451507/favoritedArticles-notifications
• feature/160451521/track-comment-history
• feature/160451517/like-comments
• feature/160451519/role-access-control
• feature/160451516/article-report
• ft/160451507/inApp-Notification
• feature/161250161/add-categories
• feature/160451520/highlight-and-comment
• ft/160451513/share-articles
• feature/160451518/users-reading-stats
• ft/160451513/share-articles-socialMedia
• feature/161368021/admin-add-category
• feature/161250654/save-draft-articles
• feature/161250004/users-article-preference
• feature/161407876/delete-reported-article
• chore/161250004/users-article-preference-test
• feature/161410873/update-documentation
• bug/161746560/fix-reset-password
• bug/161804322/fix-social-auth
• bug/161873816/fix-password-validation
• Bug/ReturnUserProfile
• bug/162000891/get-featured-articles
• feature/getLikeStatus
• bug/162040140/fix-backend-errors
• rough-work
• bug/fix-user-following
• bug/162136756/return-user-details
• fix-tags
• bug/162302588/show-tags-in-articles
• implement-feedback-search
• bug/162339609/fix-search-and-categories

fix merge conflict