3e21483b82
Merge branch 'develop' of github.com:vector-im/riot-web into joriks/font-sclaing-slider
Merge branch 'develop' of github.com:vector-im/riot-web into joriks/font-sclaing-slider