public/sass/pages · 717cce014b528d57218f6a5ded7eca7c4ec528f9 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

History Find file

Merge branch 'master' into alerting · b0fe6982
```
Conflicts:
	public/app/core/services/alert_srv.ts
	public/app/partials/confirm_modal.html
```
Torkel Ödegaard committed Jul 18, 2016
b0fe6982

Name	Last commit	Last Update
..
_admin.scss		Loading commit data...
_alerting.scss		Loading commit data...
_dashboard.scss		Loading commit data...
_login.scss		Loading commit data...
_playlist.scss		Loading commit data...
_plugins.scss		Loading commit data...
_signup.scss		Loading commit data...
_styleguide.scss		Loading commit data...