about summary refs log tree commit diff
path: root/app/views/settings
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-04-03 19:17:20 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-04-03 19:17:20 +0000
commit6611100480c86c07972c1223e7231c136966e11d (patch)
treed6ce7cf9568d13ba0dfc8ee32fd1335e0d053f43 /app/views/settings
parent1f5bdd8445f6ba192618288504b74c1df7c09ea6 (diff)
parentd8d42179590db772cc5b1873385cba7e5afe20df (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/views/settings')
0 files changed, 0 insertions, 0 deletions