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

Feature/adminlte #262

Merged
merged 56 commits into from
Jul 27, 2015
Merged

Feature/adminlte #262

merged 56 commits into from
Jul 27, 2015

Conversation

55
Copy link
Contributor

@55 55 commented Jul 23, 2015

Closing #211

@55 55 added the in progress label Jul 23, 2015
Conflicts:
	.meteor/packages
	client/chart/chart_layout.html
	client/views/api_backends/api_backends.html
	client/views/dashboard/dashboard.html
@JuusoV JuusoV self-assigned this Jul 23, 2015
@55
Copy link
Contributor Author

55 commented Jul 27, 2015

@JuusoV is this ready to be merged?

JuusoV added a commit that referenced this pull request Jul 27, 2015
@JuusoV JuusoV merged commit 4785dbb into develop Jul 27, 2015
JuusoV added a commit that referenced this pull request Jul 27, 2015
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