about summary refs log tree commit diff
path: root/app/views/settings/preferences
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-06-10 12:12:14 +0200
committerGitHub <noreply@github.com>2020-06-10 12:12:14 +0200
commit0a5cf075cdddbbe40e79ebad8ee2b1abd62d3200 (patch)
tree313cace275cee0d74fac462a4a919955d50ac440 /app/views/settings/preferences
parent34d92e023332ce492748866a4373593d2ab849e8 (diff)
parentb9d75e49c275357d06a2e120d187d3a4ede5ecb7 (diff)
Merge pull request #1356 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/settings/preferences')
0 files changed, 0 insertions, 0 deletions