summaryrefslogtreecommitdiff
path: root/app/controllers/page_controller.rb
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-30 17:09:29 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-30 17:09:29 +0100
commitcc2a6de28e676b5afb73f3fafb5b417301927cc9 (patch)
tree4a98c8adf671bb70d71d1e92972dc89b933ed2d9 /app/controllers/page_controller.rb
parentf2bb713ff7b02485f551fe97071f4af08d957caf (diff)
parent3867ea2c1b7b839c1a1afc2a1abaa12f9dba74dd (diff)
Merge branch 'fix_update_and_destroy_of_user_groups' into develop
Diffstat (limited to 'app/controllers/page_controller.rb')
0 files changed, 0 insertions, 0 deletions