Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
[akkoma] / priv / gettext /
2017-03-17 Roger BraunPhoenix skeleton