b294569147
Merging conflicts fixed in files: CMakeLists.txt configure.ac distros/debian_cmake/control src/zm_monitor.h web/lang/de_de.php web/skins/classic/views/monitor.php |
||
---|---|---|
.. | ||
Makefile.am | ||
actions.php | ||
config.php.in | ||
control_functions.php | ||
database.php | ||
functions.php | ||
lang.php | ||
logger.php |