Skip to content
Snippets Groups Projects
Commit 1d532b56 authored by Michał Olber's avatar Michał Olber
Browse files

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

# Conflicts:
#	templates/Template App MySQL.xml
#	templates/Template App Postfix.xml
parents d74cec67 8071d28d
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment