Merge remote-tracking branch 'origin/develop' into conversations-import
[akkoma] / priv / gettext /
2017-03-17 Roger BraunPhoenix skeleton