about summary refs log tree commit diff
path: root/LICENSE
diff options
context:
space:
mode:
authorStarfall <us@starfall.systems>2021-06-08 09:28:57 -0500
committerStarfall <us@starfall.systems>2021-06-08 09:28:57 -0500
commitf95637178671b1aa0648fa506231717229a6cd8f (patch)
treefbaa725bcdb88220c5d1e299b338b196822460e5 /LICENSE
parent2c6fcb9cf8fbb09e900fc3625837529155f98f4f (diff)
parentdb5baf3d1a93cbf6961f721205cff0beaf71bffd (diff)
Merge branch 'glitch'
Conflicts:
	yarn.lock: caniuse-lite has been outdated in upstream for
	awhile, and we fixed it a few weeks ago in our fork
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions