kishorenc 5dc7df793c Merge branch '0.18.0-patches' into 0.20.0-rc
# Conflicts:
#	include/auth_manager.h
#	include/collection_manager.h
#	include/http_server.h
#	src/auth_manager.cpp
#	src/collection_manager.cpp
#	src/http_server.cpp
2021-02-16 12:54:42 +05:30
..
2020-06-22 18:17:52 +05:30