Merge branch 'develop' into activation-meta
authorMark Felder <feld@FreeBSD.org>
Tue, 30 Jun 2020 20:09:03 +0000 (15:09 -0500)
committerMark Felder <feld@FreeBSD.org>
Tue, 30 Jun 2020 20:09:03 +0000 (15:09 -0500)
commit0883a706dc376fdfb7de9df1366803e87c8e7c98
treedc43f7b09dddd3300efd7b3ebbc0e82e60a978c5
parent954acdda2072cac343409b3d17d831b86ac6a18c
parentb9e6ad571ac5925431466d6e6b27c0b372bb7727
Merge branch 'develop' into activation-meta
lib/pleroma/web/mastodon_api/views/instance_view.ex