about summary refs log tree commit diff
path: root/app/javascript/skins/glitch
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-10-09 21:08:26 +0200
committerThibaut Girka <thib@sitedethib.com>2018-10-09 21:08:26 +0200
commita02244f17c841f641c9ed289fb592b73fecf472d (patch)
tree39a682cbdd9307bd437f6cbf4eda3430cac87bc6 /app/javascript/skins/glitch
parent269edc0e48886ea90455283f08a646c86387cfbc (diff)
parent46e4a759bbe0e78fdbb4c1573a404bd4b531315a (diff)
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
Diffstat (limited to 'app/javascript/skins/glitch')
0 files changed, 0 insertions, 0 deletions