about summary refs log tree commit diff
path: root/spec/models/user_spec.rb
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-11-24 01:17:20 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-11-24 01:17:20 +0000
commit167fe2ab08288ce286f5c7660ff0ed587b65b988 (patch)
tree1a4c7d23cb3dd6993c0ce57a637a161e3405dba5 /spec/models/user_spec.rb
parentfaad820458401b5a01f24d4da4bf2acf59ef440d (diff)
parente84fecb7e97851ed56f4d954e2d68128bb87da37 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'spec/models/user_spec.rb')
0 files changed, 0 insertions, 0 deletions