Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend
[akkoma] / lib / pleroma / web / gettext.ex
2017-03-17 Roger BraunPhoenix skeleton