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

Fix readme casing #345

Closed
wants to merge 72 commits into from
Closed

Conversation

jeremywiebe
Copy link

@jeremywiebe jeremywiebe commented Mar 6, 2017

No description provided.

zacharyhalvorson and others added 24 commits October 6, 2016 14:46
# Conflicts:
#	bin/styleguidist.js
#	package.json
#	src/rsg-components/Components/Components.js
#	src/rsg-components/Editor/Editor.js
#	src/rsg-components/Layout/Layout.js
#	src/rsg-components/Layout/Renderer.js
#	src/rsg-components/Playground/Playground.js
#	src/rsg-components/Preview/Preview.js
#	src/rsg-components/Props/Props.css
#	src/rsg-components/Props/Props.js
#	src/rsg-components/ReactComponent/ReactComponent.css
#	src/rsg-components/ReactComponent/ReactComponent.js
#	src/rsg-components/ReactComponent/ReactComponentRenderer.js
#	src/rsg-components/Section/Section.js
#	src/rsg-components/Section/SectionRenderer.js
#	src/rsg-components/Sections/Sections.js
#	src/rsg-components/StyleGuide/StyleGuide.css
#	src/rsg-components/StyleGuide/StyleGuide.js
#	src/rsg-components/TableOfContents/TableOfContents.css
#	src/rsg-components/TableOfContents/TableOfContents.js
Merge 4.1.0 into our fork
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.

4 participants