about summary refs log tree commit diff
path: root/app/models/instance.rb
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-01-03 04:17:11 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-01-03 04:17:11 +0000
commit933840bebf4ce8f5282c88e8c3e8c1b3675fbf2d (patch)
treee1d156a830d9446218ad1f250111dfc32df76961 /app/models/instance.rb
parentfa768abf5c10eb3469a26347a9fa5ff677b3d394 (diff)
parent99f962ba731f67050a914bb5b9a245869531ebd1 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/models/instance.rb')
0 files changed, 0 insertions, 0 deletions