summaryrefslogtreecommitdiff
path: root/app/controllers/api/v1/phone_book_entries_controller.rb
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-06-27 20:59:32 +0200
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-06-27 20:59:32 +0200
commitd95155baebf7004bfc99c13545e343b8bd0882b6 (patch)
tree480d5bdf3f8e1354e56281d497300f776a1c980b /app/controllers/api/v1/phone_book_entries_controller.rb
parentaad51572a6c75a4cbd2d44804b82f634a4ddd732 (diff)
parent51c51156e22b16fb5c120aed8dfef13a2d10b465 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/controllers/api/v1/phone_book_entries_controller.rb')
0 files changed, 0 insertions, 0 deletions