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 master into pr #6151 #6224

Closed
wants to merge 5 commits into from
Closed

Merge master into pr #6151 #6224

wants to merge 5 commits into from

Conversation

spalger
Copy link
Contributor

@spalger spalger commented Feb 12, 2016

This is a merge of #6151 with master, once it's deemed G2G this can be merged.

Trevan Richins and others added 5 commits February 8, 2016 13:05
Each chromeConfigControl has a navbar component and a config component.
…me-ui

Conflicts:
	src/ui/public/chrome/context.js
Change kbn-chrome-config-controls to an element
Import the config section html instead of require
@epixa
Copy link
Contributor

epixa commented Feb 23, 2016

jenkins, test it

@epixa
Copy link
Contributor

epixa commented Feb 25, 2016

Closed in favor of the original, which now has master merged into it as well as a bug fix: #6151

@epixa epixa closed this Feb 25, 2016
@spalger spalger deleted the pr/6151 branch February 25, 2016 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants