apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
Conflicts:
	.gitignore
pull/1580/head
Torkel Ödegaard 10 years ago
parent 99259d246b 15cb1d8980
commit f32c34c726
1 changed files with 1 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      .gitignore

3
.gitignore vendored
Unescape View File

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

Write Preview
Loading…
Cancel
Save