Merging in the responsive redesign#522
Merged
bridgetkromhout merged 2541 commits intomasterfrom Jun 4, 2016
Merged
Conversation
Former-commit-id: 6eb2650
Refactoring language around keynote talk Former-commit-id: 46912f8
Refactoring language around keynote talk
Refactoring language around keynote talk Former-commit-id: 46912f8
Clean-up DC 2016 Sponsorship Former-commit-id: 754bc19
Clean-up DC 2016 Sponsorship
Clean-up DC 2016 Sponsorship Former-commit-id: 754bc19
Signed-off-by: Nathen Harvey <nharvey@chef.io> Former-commit-id: 53ced98
Signed-off-by: Nathen Harvey <nharvey@chef.io>
Signed-off-by: Nathen Harvey <nharvey@chef.io> Former-commit-id: 53ced98
InfoZen is a gold sponsor, not Platinum [DC2016] Former-commit-id: c5cefa2
InfoZen is a gold sponsor, not Platinum [DC2016]
InfoZen is a gold sponsor, not Platinum [DC2016] Former-commit-id: c5cefa2
Former-commit-id: e7086be
Former-commit-id: e7086be
Former-commit-id: 52fc39d
Former-commit-id: 52fc39d
…date Former-commit-id: 2fe6cf7
…date Former-commit-id: 2fe6cf7
Former-commit-id: e7c7c58
Former-commit-id: e7c7c58
[DC 2016] Change my affiliation Former-commit-id: 3fcbcc7
[DC 2016] Change my affiliation
[DC 2016] Change my affiliation Former-commit-id: 3fcbcc7
[DC 2016] add GovReady to sponsors Former-commit-id: 456336f
[DC 2016] add GovReady to sponsors
A few suggestions
MSP, Singapore
Migrating more programs
It's ugly and needs something to make it look nicer, but it works
Conflicts: content/events/2016-siliconvalley/program.md
POA & AMS program updates
Making the security track readable in new design.
Adding legacy images for #485.
Mechanism: making events a page to add alias
Creating redirect for presentations
Adds link to future & past events where expected.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is the merge for the responsive redesign discussed in #359. Please discuss in that issue or open new issues as desired.
Thanks to @mattstratton for doing the bulk of the heavy lifting here.