Sem van der Hoeven 309337f26d MERGE::Merge branch 'fix_gradle_build_file' ...

# Conflicts:
#	src/GoGreen/Client/src/test/java/UserServiceTest.java
resolved using 'Theirs'

2019-03-11 15:48:58 +01:00

..

.idea

EDIT:: edited gitignore file to include the .gradle and .idea directories, and to include the classpath and project files.

2019-03-09 13:40:19 +01:00

Client

ADD::added titles to the pages from the GUI

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

Common

REMOVE::removed settings.gradle file in src folder

2019-03-09 14:12:44 +01:00

GoGreen/Client/src/test/java

MERGE::Merge branch 'fix_gradle_build_file'

2019-03-11 15:48:58 +01:00

Server

ADD:: Added dashboard

2019-03-11 14:05:26 +01:00

.classpath

EDIT:: edited gitignore file to include the .gradle and .idea directories, and to include the classpath and project files.

2019-03-09 13:40:19 +01:00

.project

EDIT:: edited gitignore file to include the .gradle and .idea directories, and to include the classpath and project files.

2019-03-09 13:40:19 +01:00