Merge branch 'master' into travis/fix-changelog

This commit is contained in:
Travis Ralston 2019-02-10 17:53:29 -07:00
commit b42310ab9d
12 changed files with 42 additions and 21 deletions

View file

@ -774,7 +774,7 @@ class MatrixUnits(Units):
"Privileged server plugins",
), TypeTableRow(
"`Identity Service API <identity_service/"+is_ver+".html>`_",
"unstable",
is_ver,
"Mapping of third party IDs to Matrix IDs",
), TypeTableRow(
"`Push Gateway API <push_gateway/"+push_gw_ver+".html>`_",