Olivier Massot 22b29f72c4 merge release/2.5 7 mesiacov pred
..
blank.vue f6335c9b7f add a public page for zabbix to ping 8 mesiacov pred
default.vue e35a052b1c fix merge conflicts 8 mesiacov pred
error.vue c3da69d5a7 fix eslint errors 7 mesiacov pred
parameters.vue 809edc93e9 lint 8 mesiacov pred