Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	app/javascript/packs/public.js

Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
This commit is contained in:
Thibaut Girka committed 2018-10-09 21:08:26 +02:00
commit a02244f17c
7 files changed
+50 -14

No files matched your search

+1 -1
View File
@@ -56,7 +56,7 @@ delegate(document, '.input-copy input', 'click', ({ target }) => {
});
delegate(document, '.input-copy button', 'click', ({ target }) => {
const input = target.parentNode.querySelector('input');
const input = target.parentNode.querySelector('.input-copy__wrapper input');
input.focus();
input.select();