Pererinha dfeed011a0 Merge branch 'master' into PexCardAPI_4270 ...

Conflicts:
	include/controllers/default/cockpit2/api/test/index.php
	include/views/default/crunchbutton/frontend/order.phtml

2015-02-09 12:12:26 -02:00

..

cockpit

Check all the places where we send text message to CS #4475

2015-02-08 13:01:57 -02:00

cockpit2

Merge branch 'master' into PexCardAPI_4270

2015-02-09 12:12:26 -02:00

crunchbutton

automatically shut down community when there is no driver on call at that time #4513

2015-02-06 12:12:54 -02:00

quick

fixed additional status things

2014-11-15 16:06:42 -08:00