-
Mickaël Turnel authored
# Conflicts: # .gitmodules # CMakeLists.txt # src/CMakeLists.txt # src/Makefile.am # src/agent.cc # src/authdb-file.cc # src/authdb.cc # src/main.cc # src/module-auth.cc # src/module-pushnotification.cc # src/presence/list-subscription.cc # src/presence/presentity-presenceinformation.cc # src/presence/presentity-presenceinformation.hh # src/registrardb-redis-async.cc # src/registrardb.cc
bf485916