Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
[akkoma] / lib / pleroma / web / templates / static_fe / static_fe / error.html.eex
2019-11-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-11-15 rinpatchMerge branch 'bugfix/1395-email-activation' into 'develop'
2019-11-14 feldMerge branch 'feature/reports-groups-and-multiple-state...
2019-11-14 rinpatchMerge branch 'reactions' into 'develop'
2019-11-11 feldMerge branch 'nodeinfo-federation-enabled' into 'develop'
2019-11-11 kaniiniMerge branch 'feature/static-fe' into 'develop'
2019-11-10 Phil HagelbergRender errors in HTML, not with JS.