Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forgot to merge this one in the previous change #38

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open

Forgot to merge this one in the previous change #38

wants to merge 31 commits into from

Conversation

bamse16
Copy link
Contributor

@bamse16 bamse16 commented Jan 6, 2018

In the first 21 commits, only file is changed, fixes a mistake from the last merge.

The other 10 commits are related to issue #26.

# Conflicts:
#	BodyweightFitness/Domain/RepositoryCategory.swift
#	BodyweightFitness/Domain/RepositoryRoutine.swift
#	Podfile
Fixed home screen background colour (white) when pulling the scrollview

Abstract content view bg color is set to white, the home view controller bg color is set to primary, so on pull, on the top part, you’ll get the primary
Fixed First exercise reps change is not persisted #26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant