Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
[akkoma] / priv / gettext / en /
2017-03-17 Roger BraunPhoenix skeleton