Merge master branch into dev

ConnectedPlacesCatapult / SharingCitiesDashboard

Personalisable dashboard for Sharing Cities IoT data

Apache License 2.0

6 stars 5 forks source link

Merge master branch into dev #174

Closed WizardNo7 closed 5 years ago

WizardNo7 commented 5 years ago

The dev and master branches are not inline as gitflow would suggest, so this PR will bring all changes from master into dev after which the only differences between dev and master branches will be what is changed/new in dev.

PaddyEriksen commented 5 years ago

Tested locally, looks fine