am a6c8a0e6
: am d8b606b8
: am 2f3bc3cb
: (-s ours) am e3904c4f
: am e8e7b9b3
: Added a check if a custom activity can be started automerge: 3a3ff59
automerge: 5b2b7e1
* commit '5b2b7e189766e889118059902a15a4ce2c127e9d':
This commit is contained in: