Skip to content

Feature/adminlte#262

Merged
JuusoV merged 56 commits intodevelopfrom
feature/adminlte
Jul 27, 2015
Merged

Feature/adminlte#262
JuusoV merged 56 commits intodevelopfrom
feature/adminlte

Conversation

@55
Copy link
Copy Markdown
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 55 force-pushed the feature/adminlte branch from 591230b to ae1fa69 Compare July 24, 2015 06:40
@55
Copy link
Copy Markdown
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.

2 participants