summaryrefslogtreecommitdiff
path: root/app/controllers/conference_invitees_controller.rb
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-04 14:31:42 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-04 14:31:42 +0100
commitda3ae3cb90697c66beda10fb5d6cb6186055ed3f (patch)
tree7fe3f270694aeeb804021048167731da698ea662 /app/controllers/conference_invitees_controller.rb
parent5a58c0c41de983a72cdacd06c5be80f120d1e080 (diff)
parent87634e025711be508501cce8c05f23085dad8f9d (diff)
Merge branch 'phone_numbers_sortable' into develop
Diffstat (limited to 'app/controllers/conference_invitees_controller.rb')
0 files changed, 0 insertions, 0 deletions