Commit b347fdd6 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch 'conflict-in-update-preferences' into 'devel_15.0.x'

Conflict in update preferences

See merge request !1228
parents e1e83c29 d8c5562b
Pipeline #30953 passed with stage
in 14 minutes and 41 seconds