Merge branch 'hotfix/html-sanitization' into 'develop'
authorlambda <lain@soykaf.club>
Fri, 5 Apr 2019 12:43:57 +0000 (12:43 +0000)
committerlambda <lain@soykaf.club>
Fri, 5 Apr 2019 12:43:57 +0000 (12:43 +0000)
commit5499750054081a4d4ac8a8b7b75dfd0a81f2a455
tree667bdd7fb652aef9c4eea58dbad0be6b43644da3
parent9c9eec62c2fb67507708dd9e5d3f80a098881a6e
parentf0f30019e1c9992cb420ba54457840cddaeb6a3a
Merge branch 'hotfix/html-sanitization' into 'develop'

Refactor html caching functions to use a key instead of a module, use more correct terminology and fix summaries in mastoapi

See merge request pleroma/pleroma!1022