Go to file
WolverinDEV 7f1254b05e Merge branch 'master' into 1.4.0
# Conflicts:
#	server/CMakeLists.txt
#	server/src/client/voice/VoiceClientConnection.cpp
2019-10-21 21:01:23 +02:00
client Reinitialized project to reduce the git branch size 2019-07-17 19:37:18 +02:00
cmake/Modules Reinitialized project to reduce the git branch size 2019-07-17 19:37:18 +02:00
flooder Reinitialized project to reduce the git branch size 2019-07-17 19:37:18 +02:00
git-teaspeak@819ba6d090 Version 1.3.25 2019-10-21 20:51:03 +02:00
license Fixed some bugs 2019-10-20 12:09:28 +02:00
music@af7918a243 Submodule init 2019-07-17 19:35:03 +02:00
MusicBot First implementation for the conversation system (not 100% finished yet) 2019-07-19 22:55:03 +02:00
server Merge branch 'master' into 1.4.0 2019-10-21 21:01:23 +02:00
shared@c532266cb8 Fixed server group copy 2019-10-21 20:46:17 +02:00
.git-old Reinitialized project to reduce the git branch size 2019-07-17 19:37:18 +02:00
.gitignore Reinitialized project to reduce the git branch size 2019-07-17 19:37:18 +02:00
.gitmodules Reinitialized project to reduce the git branch size 2019-07-17 19:37:18 +02:00
CMakeLists.txt Updated CMakeLists 2019-10-13 20:00:36 +02:00