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.

Sign up for GitHub

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

Jump to bottom

wai-app-static: make ssAddTrailingSlash work in combination with ssIn… #569

Merged
merged 1 commit into from
Jul 29, 2016
Merged

wai-app-static: make ssAddTrailingSlash work in combination with ssIn… #569

merged 1 commit into from
Jul 29, 2016

Conversation

soenkehahn
Copy link
Contributor

…dices

@soenkehahn
Copy link
Contributor Author

Please don't merge yet, something seems to be wrong with WaiAppStatic.Storage.Embedded.TH.mkSettings now.

@soenkehahn
Copy link
Contributor Author

Disregard my last comment. mkSettings has an unrelated problem.

@soenkehahn
Copy link
Contributor Author

The travis failure seems unrelated...

@snoyberg
Copy link
Member

Looks like there's a merge conflict with the previous PR, can you resolve?

@soenkehahn
Copy link
Contributor Author

Of course. I'm on it.

@soenkehahn
Copy link
Contributor Author

Rebased on master.

@snoyberg snoyberg merged commit 3e04ec2 into yesodweb:master Jul 29, 2016
@snoyberg
Copy link
Member

Thanks!

snoyberg added a commit that referenced this pull request Aug 2, 2016
@snoyberg
Version bump for #569 #570
7f4d8ed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@soenkehahn @snoyberg