Activity update + new translations
Merge remote-tracking branch 'upstream/3.0-dev' into activity
activity update
Activity migration
Merge pull request #638 from solispauwels/activity

Activity update + new translations