Merge branch 'develop' into update-oauth-template
authorMark Felder <feld@FreeBSD.org>
Mon, 3 Jun 2019 14:12:17 +0000 (09:12 -0500)
committerMark Felder <feld@FreeBSD.org>
Mon, 3 Jun 2019 14:12:17 +0000 (09:12 -0500)
commitf4e2595592ccca6cedd64669baef7bdd2a6547d0
tree6806a79345c7599b0d436df8b6c46e75b54d1292
parent3c4cab9be18ff543d025177b418ddd0b16050e68
parent9789e000b05621435dc0c03833f564481e0b80e6
Merge branch 'develop' into update-oauth-template
lib/pleroma/web/templates/layout/app.html.eex