Merel Steenbergen 6a2eb27627 Merge branch 'Feature/delete_a_friend' into 'master' ...

Feature/remove a friend

See merge request cse1105/2018-2019/oopp-group-43/template!60

2019-04-03 14:29:36 +00:00

..

Client

Merge branch 'Feature/delete_a_friend' into 'master'

2019-04-03 14:29:36 +00:00

Common

FIX:: checkstyle fixes

2019-03-26 15:39:15 +01:00

Server

Remove addFriend part from removeFriendTest from UserControllerTest.java

2019-04-03 13:40:53 +00:00