summaryrefslogtreecommitdiff
path: root/app/controllers/group_permissions_controller.rb
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-12 11:23:57 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-12 11:23:57 +0100
commitb16aeeccff8de5fd579d79a48740df7a3e34e7bc (patch)
treebb2ddcb29c6a465d73a3010437bdd076d11360c9 /app/controllers/group_permissions_controller.rb
parent3c5a0511d228fb3dc00ae860ade1b8ff032cc42f (diff)
parent40b2feb99d75074319f371087c521df198527266 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/controllers/group_permissions_controller.rb')
0 files changed, 0 insertions, 0 deletions