Sem van der Hoeven cbf15d9574 Merge branch 'master' into 'add/activity_tooltips' ...

# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/DashBoardController.java
#   src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java

2019-04-08 12:13:44 +00:00

..

Client

Merge branch 'master' into 'add/activity_tooltips'

2019-04-08 12:13:44 +00:00

Common

FIX:: checkstyle fixes

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

Server

Fix all errors for extra activities

2019-04-08 11:17:34 +02:00