about summary refs log tree commit diff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-23 19:01:12 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-23 19:01:12 +0100
commit3373ae02ded0ac5847350da9f9550721cdebe732 (patch)
tree3fa12a04c5af6aa67043c797093e2d9872b1f5ce /app/models/user.rb
parentd74cef45aafb1bf049c7ee0e7b3b334aefdf5c17 (diff)
parent79a01358698ad3889b0c9a43cfb2f886fbae77e4 (diff)
Merge branch 'development'
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions