diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-29 09:06:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-29 09:06:00 -0500 |
| commit | 6a1544bd4618706204eb8220c9da984be3103aa1 (patch) | |
| tree | 23327fe190fd90589c9dc8d64e96fcf0b7d28ddd /app/javascript/flavours/glitch/features/local_settings/index.js | |
| parent | 8b98afa781018bc7cfdb325f6b1fca0b1edcd8cb (diff) | |
| parent | c087738270e7fb16b1d284e8dd72cf99b4238bb8 (diff) | |
Merge pull request #525 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/local_settings/index.js')
0 files changed, 0 insertions, 0 deletions