summaryrefslogtreecommitdiff
path: root/users/app/models/identity.rb
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-10-28 08:52:54 +0100
committerAzul <azul@leap.se>2013-10-28 08:52:54 +0100
commit7abdb17fef4c48dc62621cb10062f14379039cdf (patch)
treed1fe0b9796526e063e928a00d942e6e99a3dc457 /users/app/models/identity.rb
parent1b8d773ad61df9d97f4f800944cd78ae6cc51938 (diff)
parent7b3dd8c2c0436518c7c80d37498b57fcf3b1eaf8 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'users/app/models/identity.rb')
0 files changed, 0 insertions, 0 deletions