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

Migrating more programs #498

Merged
merged 3 commits into from Jun 2, 2016
Merged

Conversation

bridgetkromhout
Copy link
Collaborator

Just a few things here - bringing over programs.

The Silicon Valley one will cause a merge conflict when you merge master in again, and we should resolve it in favor of this new one. This brings over all the content Jen submitted, but in responsive form.

@bridgetkromhout bridgetkromhout merged commit af35dab into mattstratton/redesign Jun 2, 2016
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.

None yet

2 participants