Commits
Ivo Kurzemnieks authored b3562afc4ddM
.......... [ZBX-16695] updated to latest from /master and resolved conflicts in: - ChangeLog - configure.ac - frontends/php/include/classes/api/services/CHost.php - frontends/php/include/classes/api/services/CHostPrototype.php - frontends/php/include/defines.inc.php - frontends/php/jsLoader.php - frontends/php/locale/bg/LC_MESSAGES/frontend.po - frontends/php/locale/ca/LC_MESSAGES/frontend.po - frontends/php/locale/cs/LC_MESSAGES/frontend.po - frontends/php/locale/de/LC_MESSAGES/frontend.po - frontends/php/locale/el/LC_MESSAGES/frontend.po - frontends/php/locale/en_US/LC_MESSAGES/frontend.po - frontends/php/locale/es/LC_MESSAGES/frontend.po - frontends/php/locale/fa/LC_MESSAGES/frontend.po - frontends/php/locale/fi/LC_MESSAGES/frontend.po - frontends/php/locale/fr/LC_MESSAGES/frontend.po - frontends/php/locale/he/LC_MESSAGES/frontend.po - frontends/php/locale/hu/LC_MESSAGES/frontend.po - frontends/php/locale/id/LC_MESSAGES/frontend.po - frontends/php/locale/it/LC_MESSAGES/frontend.po - frontends/php/locale/ja/LC_MESSAGES/frontend.po - frontends/php/locale/ka/LC_MESSAGES/frontend.po - frontends/php/locale/ko/LC_MESSAGES/frontend.po - frontends/php/locale/lt/LC_MESSAGES/frontend.po - frontends/php/locale/lv/LC_MESSAGES/frontend.po - frontends/php/locale/nb/LC_MESSAGES/frontend.po - frontends/php/locale/nl/LC_MESSAGES/frontend.po - frontends/php/locale/pl/LC_MESSAGES/frontend.po - frontends/php/locale/pt_BR/LC_MESSAGES/frontend.po - frontends/php/locale/pt_PT/LC_MESSAGES/frontend.po - frontends/php/locale/ro/LC_MESSAGES/frontend.po - frontends/php/locale/ru/LC_MESSAGES/frontend.po - frontends/php/locale/sk/LC_MESSAGES/frontend.po - frontends/php/locale/sv/LC_MESSAGES/frontend.po - frontends/php/locale/tr/LC_MESSAGES/frontend.po - frontends/php/locale/uk/LC_MESSAGES/frontend.po - frontends/php/locale/vi/LC_MESSAGES/frontend.po - frontends/php/locale/zh_CN/LC_MESSAGES/frontend.po - frontends/php/locale/zh_TW/LC_MESSAGES/frontend.po - frontends/php/tests/api_json/testAPIInfo.php - go/src/zabbix/pkg/version/version.go - include/version.h - src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
Showing diff toa9fa3085f68