Commit Graph

2 Commits

Author SHA1 Message Date
Michał Olber
1d532b564e Merge branch 'master' of github.com:thecamels/zabbix
# Conflicts:
#	templates/Template App MySQL.xml
#	templates/Template App Postfix.xml
2016-05-02 14:01:49 +02:00
Kamil Porembinski
7c43b446ea RServer monitoring 2016-05-02 09:24:36 +02:00