Sem van der Hoeven 8b94c80ca0 Merge branch 'cleanUpRepository' ...

# Conflicts:
#	src/GoGreen/Client/.gradle/5.2.1/fileHashes/fileHashes.lock
#	src/GoGreen/Client/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/GoGreen/Client/.gradle/buildOutputCleanup/cache.properties

Conflicts resolved using 'Theirs'

2019-03-06 15:01:11 +01:00

..

meetings

Merge branch 'cleanUpRepository'

2019-03-06 15:01:11 +01:00

Pictures Group Members

Add Client, Server, Common

2019-03-04 10:18:36 +01:00

Project Details

Delete docx file, md file is sufficient

2019-03-06 11:37:28 +01:00

reports

Merge branch 'updateCientServer' into 'master'

2019-03-04 16:08:47 +00:00

sprints

FIX: layout doc

2019-03-04 17:00:59 +01:00