about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-01-07 02:17:10 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-01-07 02:17:10 +0000
commitbcbdd4f88d32c9aabc06265e62e5532ebf49c2a3 (patch)
tree702e37ff55c01ffb19ddf233a6cadebed2cb759c /app/controllers/settings
parentb5874c1428d9445921db242b248798adbf7b4b9d (diff)
parent9e97fbf0afc680ae2bd833d9431f17bcc0a07c17 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers/settings')
0 files changed, 0 insertions, 0 deletions