summaryrefslogtreecommitdiff
path: root/app/controllers/group_memberships_controller.rb
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-12 13:40:40 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-12 13:40:40 +0100
commita2754c9a3bfd83cf9fcfb6a1bf7469507fb9e44c (patch)
tree77181b0a6e09b6706237cb279f4763978932bb69 /app/controllers/group_memberships_controller.rb
parentb08abf797d8e476e07a89e40f43cddef32039dfb (diff)
parent5d3eeec6962010eb0b9cbcb9d3bb87d016bce199 (diff)
Merge branch 'switchboard' into develop
Diffstat (limited to 'app/controllers/group_memberships_controller.rb')
0 files changed, 0 insertions, 0 deletions