Files · 1a49d51d42a27f74acb66f7e0adfa1e0584fd4c9 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

History Find file

Merge branch 'Bps' of https://github.com/gitbisector/grafana into units · 1a49d51d
```
Conflicts:
	src/app/panels/graph/axisEditor.html
	src/app/panels/singlestat/editor.html
```
Torkel Ödegaard committed Jan 12, 2015
1a49d51d

Name	Last commit	Last Update
sample		Loading commit data...
src		Loading commit data...
tasks		Loading commit data...
.gitignore		Loading commit data...
.jscs.json		Loading commit data...
.jsfmtrc		Loading commit data...
.jshintrc		Loading commit data...
.travis.yml		Loading commit data...
CHANGELOG.md		Loading commit data...
CONTRIBUTING.md		Loading commit data...
Gruntfile.js		Loading commit data...
LICENSE.md		Loading commit data...
NOTICE.md		Loading commit data...
README.md		Loading commit data...
latest.json		Loading commit data...
package.json		Loading commit data...