Merge branch 'prometheus-update' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 10 Jul 2020 08:27:41 +0000 (08:27 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 10 Jul 2020 08:27:41 +0000 (08:27 +0000)
commit77c4c60e55617e3476493954bfdf44ce6c2600e0
tree03e6561ab75cb70eee95e266969b36df179cc523
parent4301ae386154b5c6b863034491fe930ae8975459
parentb6688030fad62cc8be32faf928ff6ec418940efc
Merge branch 'prometheus-update' into 'develop'

prometheus update for OTP 23

See merge request pleroma/pleroma!2746