Merge branch 'develop' into update-oauth-template
authorMark Felder <feld@FreeBSD.org>
Wed, 1 May 2019 17:32:17 +0000 (12:32 -0500)
committerMark Felder <feld@FreeBSD.org>
Wed, 1 May 2019 17:32:17 +0000 (12:32 -0500)
commit3c4cab9be18ff543d025177b418ddd0b16050e68
tree3b4d32c978ecfaa656256509bf390d6ca22c6679
parent9a98f48ec3f438e543a5a621624401bb22a0d44a
parent41d78f91083b5017e6085150bfae71a842f5c47f
Merge branch 'develop' into update-oauth-template
lib/pleroma/web/templates/layout/app.html.eex
lib/pleroma/web/templates/o_auth/o_auth/show.html.eex