diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-06-24 14:32:22 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-24 14:32:22 +0200 |
commit | 4b0f27ba7822befed76f8368b472c6ade6977cb2 (patch) | |
tree | cebf03387c15cb6299d27a7988f78d173d7945de /app/javascript/skins/glitch/mastodon-light/names.yml | |
parent | 03cfe366fd0146cb4c3ede4dcdeeb2228a513e7d (diff) | |
parent | 50a2854f922ebdd2c056870a0de402329bdf1bb3 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/skins/glitch/mastodon-light/names.yml')
0 files changed, 0 insertions, 0 deletions