andela / asgard-cfh

52%

master: 55%

LAST BUILD ON BRANCH ft-user-profile-page-157801308

branch: ft-user-profile-page-157801308

CHANGE BRANCH

x

Reset

• ft-user-profile-page-157801308
• User-Profile-Page-#157801308
• ch-Test-user-signin-157801291
• ch-increase-donation-157801306
• ch-integrate-coveralls-code-coverate-157801290
• ch-setup-unit-testing-for-front-end-157801288
• ch-test-for-auth-api-#158287296
• ch-test-signup-JWT-158121598
• ch-write-test-for-user-should-be-able-to-start-a-game-157801295
• ch/setup-api-unittests#158287296
• chore-Implement-PO-Feedback-158537969
• demo-staging
• develop
• final-demo-staging
• fix-coveralls-code-coverage-158097334
• ft-Onboard-users-onto-the-app-157801298
• ft-Redesign-Actual-Gaming-Screen-#157801299
• ft-Redesign-user-Aurthentication-page-157801297
• ft-Test-user-signup-157801291
• ft-cards-should-be-categorised-by-region-157801301
• ft-connect-user-as-friend-157801303
• ft-create-effective-ui/ux-157801294
• ft-czar-draw-cards-157801300
• ft-email-verification-link-158121598
• ft-game-invitation-completion-#157801293
• ft-group-chat-157801302
• ft-integrate-all-feature-to-develop
• ft-invite-for-games-157801293
• ft-signup-validation-158028336
• ft-test-for-auth-api-#158287296
• ft-upload-profile-image-157801309
• ft-users-should-be-able-to-start/create-a-new-game-157801295
• ft/cleanup-all-unittests
• registered-users-should-be-able-to-view-game-log-157801304
• revert-23-ft-create-effective-ui/ux-157801294
• test-invite-users-157801293

Fix merge conflict