Commit 2f691d57 authored by Oliver Falk's avatar Oliver Falk

Merge branch 'devel' into 'master'

Merge in latest devel changes (clime theme and proxy example)

See merge request !139
parents d2a5be9d 1daff19e
Pipeline #1068 passed with stage
in 7 minutes and 14 seconds