Merge branch 'master' of github.com:thecamels/zabbix

# Conflicts:
#	templates/Template App MySQL.xml
#	templates/Template App Postfix.xml
This commit is contained in:
Michał Olber
2016-05-02 14:01:49 +02:00
16 changed files with 2477 additions and 2119 deletions

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<zabbix_export>
<version>3.0</version>
<date>2016-05-02T08:42:40Z</date>
<date>2016-05-02T12:00:46Z</date>
<groups>
<group>
<name>Zabbix Templates</name>