Merge branch 'bfa'

2 files changed, 6 insertions, 3 deletions

diff --git a/src/server/bnetserver/Services/ServiceDispatcher.cpp b/src/server/bnetserver/Services/ServiceDispatcher.cpp
index 8b3449ead5e..c78afa4780f 100644
--- a/src/server/bnetserver/Services/ServiceDispatcher.cpp
+++ b/src/server/bnetserver/Services/ServiceDispatcher.cpp
@@ -21,13 +21,13 @@ Battlenet::ServiceDispatcher::ServiceDispatcher()
 {
     AddService<Services::Account>();
     AddService<Services::Authentication>();
-    AddService<Service<challenge::v1::ChallengeService>>();
-    AddService<Service<channel::v1::ChannelService>>();
+    AddService<Service<club::v1::membership::ClubMembershipService>>();
     AddService<Services::Connection>();
     AddService<Service<friends::v1::FriendsService>>();
     AddService<Services::GameUtilities>();
     AddService<Service<presence::v1::PresenceService>>();
     AddService<Service<report::v1::ReportService>>();
+    AddService<Service<report::v2::ReportService>>();
     AddService<Service<resources::v1::ResourcesService>>();
     AddService<Service<user_manager::v1::UserManagerService>>();
 }
diff --git a/src/server/bnetserver/Services/ServiceDispatcher.h b/src/server/bnetserver/Services/ServiceDispatcher.h
index 796bab6565b..42969da87cd 100644
--- a/src/server/bnetserver/Services/ServiceDispatcher.h
+++ b/src/server/bnetserver/Services/ServiceDispatcher.h
@@ -24,12 +24,15 @@
 #include "AccountService.h"
 #include "AuthenticationService.h"
 #include "challenge_service.pb.h"
-#include "channel_service.pb.h"
+#include "club_membership_listener.pb.h"
+#include "club_membership_service.pb.h"
 #include "ConnectionService.h"
 #include "friends_service.pb.h"
 #include "GameUtilitiesService.h"
+#include "presence_listener.pb.h"
 #include "presence_service.pb.h"
 #include "report_service.pb.h"
+#include "api/client/v2/report_service.pb.h"
 #include "resource_service.pb.h"
 #include "user_manager_service.pb.h"