summaryrefslogtreecommitdiff
path: root/app/models/user_group.rb
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-31 12:27:06 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-31 12:27:06 +0100
commitd7776c30e782470e6fb2cb795a8fadbba8465fc2 (patch)
tree77e1503960c910a57093b1a467995ccb740c19d9 /app/models/user_group.rb
parent2a7ddaef6af6b32308b1f5dd9b3f3b53fc11d9fc (diff)
parent68f0f677c5cba6775622d0e50c4315e6361ff5c9 (diff)
Merge branch 'backup' into develop
Diffstat (limited to 'app/models/user_group.rb')
0 files changed, 0 insertions, 0 deletions