Sem van der Hoeven 6945eddf5d Merge branch 'Get_UserControllerTest_Working' ...

# Conflicts:
#	src/Server/src/test/java/UserControllerTest.java

2019-03-18 12:20:44 +01:00

..

.idea

Merge branch 'Develop_GUI_further' into master

2019-03-17 17:52:25 +01:00

Client

Merge branch 'Get_UserControllerTest_Working'

2019-03-18 12:20:44 +01:00

Common

Fix the branch and add a test

2019-03-17 18:58:56 +01:00

Server

EDIT::commented out usercontrollertest, as it is still not working, but want to merge this branch to get the gui properly

2019-03-18 12:10:43 +01:00

.classpath

Revert "Revert "MERGE::Merge branch 'fix_gradle_build_file'""

2019-03-11 16:03:00 +01:00

.project

Revert "Revert "MERGE::Merge branch 'fix_gradle_build_file'""

2019-03-11 16:03:00 +01:00