Commits
Juris Lambda authored eaf40821a24M
.......... [ZBXNEXT-7931] synced with master; with conflicts templates.tmpl had some items added in the mean while and some ids shifted. proxy.c had some functions change their names and/or signatures. similarly, trapper.c had some functions changed their signatures.
Showing diff to8f7ce600210