andela / wg-june-bunnies

88%

master: 87%

LAST BUILD ON BRANCH jk/ch-fix-migrations

branch: jk/ch-fix-migrations

CHANGE BRANCH

x

Reset

• jk/ch-fix-migrations
• develop
• dm/change-way-user-adds-meals
• dm/landing-page-rework
• dm/rework-social-auth-ui
• em/Cache_nutritional_plans
• em/allow-comparison-of-members
• em/clear_exercise_cache_when_deleting_muscles
• em/setup-circle-ci
• export-workouts
• ft-enable-user-creation-API
• fx-header-background
• jk/fix-ui-users-list
• jk/ft-add-periodization-support
• jk/ft-enable-user-creation-API
• jk/ft-endpoint-for-exercise-info
• jmutuku95-patch-1
• jmutuku95-patch-2
• lm/ft-authors-field-foreign-field
• lm/ft-get-exercises-on-mouse-hover
• lm/ft-get-exercises-on-mouse-hover-2
• lm/ft-update-muscle-list
• lp/ch-heroku-setup
• master
• miritih-patch-1
• ps/easy-translation
• ps/logandsession
• ps/sprint-one-feedback
• ps/switch-to-zanata

Merge conflicting migrations