about summary refs log tree commit diff
path: root/app/models/identity.rb
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-06-12 13:17:21 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-06-12 13:17:21 +0000
commit4d8d1fa129b5f8692311de211203bc18c614951f (patch)
treee9a1130c9a9e5a5b8babd2ba3153e4ed03a4581e /app/models/identity.rb
parent34f1fd2a621ca869c17009487e2f10063812fbd0 (diff)
parent6151308c47efb0e05bcb2c54aa1693f5ff04da5c (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/models/identity.rb')
0 files changed, 0 insertions, 0 deletions