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

Merge with master #481

Merged
merged 8 commits into from
Mar 30, 2015
Merged

Merge with master #481

merged 8 commits into from
Mar 30, 2015

Conversation

mmrtnz
Copy link
Contributor

@mmrtnz mmrtnz commented Mar 30, 2015

mmrtnz and others added 8 commits March 27, 2015 15:20
Updated mui to use peer dependency changes.
Dialog title: node instead of string
Conflicts:
	docs/src/app/components/app-left-nav.jsx
	docs/src/app/components/master.jsx
	docs/src/app/components/pages/components/tabs.jsx
	docs/src/app/components/pages/home.jsx
	docs/src/app/components/pages/page-with-nav.jsx
	src/js/dialog.jsx
	src/js/input.jsx
	src/js/menu/menu.jsx
mmrtnz added a commit that referenced this pull request Mar 30, 2015
@mmrtnz mmrtnz merged commit 089ff9b into mui:css-in-js Mar 30, 2015
@zannager zannager added the docs Improvements or additions to the documentation label Mar 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Improvements or additions to the documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants