Commit 74de00e5 authored by Riri Novita's avatar Riri Novita

Merge branch 'riri' into 'master'

issue CPSM

See merge request !1192
parents be77dfd1 bbe1ef73
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment