Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	README.md
This commit is contained in:
Alexander Zobnin
2015-05-07 20:56:14 +03:00

View File

@@ -36,4 +36,4 @@ Download [latest release](https://github.com/alexanderzobnin/grafana-zabbix/rele
```
### Grafana 2.0.x
Now in development.
Now in development.