about summary refs log tree commit diff
path: root/app/views/settings/preferences/show.html.haml
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-03-07 13:24:30 +0100
committerThibaut Girka <thib@sitedethib.com>2019-03-07 13:24:30 +0100
commit9c5e7805ccfc9b065aba7831f912287e02aeb1bb (patch)
tree0f46795c03e883893ce01170a969f51189505d32 /app/views/settings/preferences/show.html.haml
parent84c807a0dcdfd6c3c18ee37fcb5003a92a92ce3f (diff)
parent637c952ccbe5acae17bbf573f8cd24703379a615 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views/settings/preferences/show.html.haml')
0 files changed, 0 insertions, 0 deletions