IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Torkel Ödegaard 2015-03-10 08:57:14 +01:00
commit f32c34c726
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -18,8 +18,7 @@ src/css/*.min.css
/data/* /data/*
/bin/* /bin/*
/grafana-pro
/grafana
conf/custom.ini conf/custom.ini
fig.yml fig.yml