Merge pull request #1372 from ThibG/glitch-soc/fixes/local-only-public-option

author ThibG <thib@sitedethib.com>

Tue, 7 Jul 2020 17:58:12 +0000 (19:58 +0200)

committer GitHub <noreply@github.com>

Tue, 7 Jul 2020 17:58:12 +0000 (19:58 +0200)
author ThibG <thib@sitedethib.com>
Tue, 7 Jul 2020 17:58:12 +0000 (19:58 +0200)
committer GitHub <noreply@github.com>
Tue, 7 Jul 2020 17:58:12 +0000 (19:58 +0200)
diff --cc app/javascript/flavours/glitch/actions/compose.js
Simple merge
diff --cc app/javascript/mastodon/actions/compose.js
Simple merge
author	ThibG <thib@sitedethib.com>
	Tue, 7 Jul 2020 17:58:12 +0000 (19:58 +0200)
committer	GitHub <noreply@github.com>
	Tue, 7 Jul 2020 17:58:12 +0000 (19:58 +0200)
		1	2
app/javascript/flavours/glitch/actions/compose.js	patch \|	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/actions/compose.js	patch \|	diff1 \|	diff2 \|	blob \| history