dummy commit
ok
Merge remote-tracking branch 'origin/develop' into jet
dummy commit
Merge remote-tracking branch 'origin/develop' into jet
change text view in card info to label view
Merge remote-tracking branch 'origin/develop' into jxy
nothing to commit