Compare commits
				merge into: ZHAW-IT21b_WIN:main
				
			
			ZHAW-IT21b_WIN:main
					
						ZHAW-IT21b_WIN:useDataObjectToSend
					
						ZHAW-IT21b_WIN:disabling_sendbutton
					
						ZHAW-IT21b_WIN:Java_Doc_and_Formatting
					
						ZHAW-IT21b_WIN:refactoring_chatwindowcontroller
					
						ZHAW-IT21b_WIN:remove_server_lock
					
						ZHAW-IT21b_WIN:continue_connectionhandler
					
						ZHAW-IT21b_WIN:chatwindow_respondig_while_connecting
					
						ZHAW-IT21b_WIN:Server_Console_Display
					
						ZHAW-IT21b_WIN:Refactoring_ClientConnectionHandler
					
						ZHAW-IT21b_WIN:ConnectionHandlerClass
					
						ZHAW-IT21b_WIN:SpecialCharacterUsername
					
						ZHAW-IT21b_WIN:Fix_WindowCloseHandler
					
						ZHAW-IT21b_WIN:Fixing_private_Messages
					
						ZHAW-IT21b_WIN:Remove_Controller_From_Handler
					
						ZHAW-IT21b_WIN:State_Sync
					
						ZHAW-IT21b_WIN:Class_Message
					
						ZHAW-IT21b_WIN:ChatWindow_Layout
					
					
					
					
				
				pull from: ZHAW-IT21b_WIN:SpecialCharacterUsername
				
			
			ZHAW-IT21b_WIN:main
					
						ZHAW-IT21b_WIN:useDataObjectToSend
					
						ZHAW-IT21b_WIN:disabling_sendbutton
					
						ZHAW-IT21b_WIN:Java_Doc_and_Formatting
					
						ZHAW-IT21b_WIN:refactoring_chatwindowcontroller
					
						ZHAW-IT21b_WIN:remove_server_lock
					
						ZHAW-IT21b_WIN:continue_connectionhandler
					
						ZHAW-IT21b_WIN:chatwindow_respondig_while_connecting
					
						ZHAW-IT21b_WIN:Server_Console_Display
					
						ZHAW-IT21b_WIN:Refactoring_ClientConnectionHandler
					
						ZHAW-IT21b_WIN:ConnectionHandlerClass
					
						ZHAW-IT21b_WIN:SpecialCharacterUsername
					
						ZHAW-IT21b_WIN:Fix_WindowCloseHandler
					
						ZHAW-IT21b_WIN:Fixing_private_Messages
					
						ZHAW-IT21b_WIN:Remove_Controller_From_Handler
					
						ZHAW-IT21b_WIN:State_Sync
					
						ZHAW-IT21b_WIN:Class_Message
					
						ZHAW-IT21b_WIN:ChatWindow_Layout
					
					
					
					
				These branches are equal. There is no need to create a pull request.