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

Update gh-pages. #3

Merged
merged 16 commits into from
Apr 28, 2014
Merged

Update gh-pages. #3

merged 16 commits into from
Apr 28, 2014

Conversation

sudodoki
Copy link

This PRs does everything #2 does, plus
a) brings in master changes into gh-pages branch
b) bypasses [https://github.com//pull/1#issuecomment-41610041](submodule issue) by simply commiting them in.

@sudodoki
Copy link
Author

Working on this one to make it work with my fork & gh-pages.

@sudodoki
Copy link
Author

This one is working with https://sudodoki.github.io/art. Do you want me to clean this up? Should I squash all commits? There was an issue with https://github.com/sudodoki/art/commit/834b1277ac3cc3a6ab0f895ae747e8f3db29a726 and similar with lib/slick/SlickSpec/Runner/JSTD-Adapter, don't really know, what happened there, don't have time to investigate that now.

sebmarkbage added a commit that referenced this pull request Apr 28, 2014
@sebmarkbage sebmarkbage merged commit 4d29b8a into sebmarkbage:gh-pages Apr 28, 2014
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.

3 participants