Merge remote-tracking branch 'upstream/develop' into admin-create-users
[akkoma] / priv / gettext /
2017-03-17 Roger BraunPhoenix skeleton