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 |
||
---|---|---|
.. | ||
debian | ||
debian8 | ||
debian8_cmake | ||
debian_cmake | ||
fedora | ||
opensuse | ||
redhat | ||
ubuntu1204 | ||
ubuntu1504 | ||
ubuntu1504_cmake_split_packages |