|
5f076b81d4
|
Merge branch 'install_dir_change' into develop
Conflicts:
CMakeLists.txt
Documentation/Tutorials/Administration-Tutorial.md
log_manager/CMakeLists.txt
server/core/CMakeLists.txt
server/core/gateway.c
server/core/maxkeys.c
server/core/maxpasswd.c
server/modules/filter/test/CMakeLists.txt
server/modules/routing/CMakeLists.txt
|
2015-05-26 13:34:39 +03:00 |
|