Merge remote-tracking branch 'origin/master' into mio/composer · zendesk/zendesk_api_client_php@d9647cf · GitHub

Commit

Merge remote-tracking branch 'origin/master' into mio/composer

Browse files

# Conflicts:
#	src/Zendesk/API/GroupMemberships.php
#	src/Zendesk/API/TicketImport.php
#	src/Zendesk/API/Tickets.php

Loading branch information

Mio Miguel Galang committed Jul 31, 2015

2 parents 8735fa1 + 5dd0643 commit d9647cf