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-04-18 19:31:53 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-04-18 19:31:53 -0500
commitd2b28ea51da3ffb99bee820ae21f9adeb3f2df2d (patch)
treed0744bd0ad1f35ba7ae493977cb3d42af85dc89a /app/models/user.rb
parent78c145d3cb6b3b0b62bf7e122abb15e919150f55 (diff)
parent21837b291ef24b75e618974925799e666353dcca (diff)
Merge remote-tracking branch 'glitchsoc/master' into gs-master
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions