about summary refs log tree commit diff
path: root/app/views/admin/instances
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-11-23 21:17:14 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-11-23 21:17:14 +0000
commitfaad820458401b5a01f24d4da4bf2acf59ef440d (patch)
treec22b1478cb1beed7c7e098424954ea6cbaa7091c /app/views/admin/instances
parent41c71565c226ef035b60af15a402e203ff680d85 (diff)
parent801eee0ff3c6a690a5d84fda865bd38f7edf8794 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/views/admin/instances')
0 files changed, 0 insertions, 0 deletions