about summary refs log tree commit diff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-05-04 03:47:35 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-05-04 03:47:35 -0500
commitc511b0f72ab6952e0ce89eb0c601fcb98eedd200 (patch)
treefb84507d0488cc22fa0885f1d7aec314d377c201 /app/models/user.rb
parentda70208b452bf751af92128ec46eea9707e1e6a9 (diff)
parent63f848ac8ccd3e76798b604265af49c7620ef8dd (diff)
Merge remote-tracking branch 'glitchsoc/master' into gs-master
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions