Daniel Camargo be4e6e74ae Merge branch 'refs/heads/master' into Driver_Onboarding_2969 ...

Conflicts:
	include/controllers/default/cockpit2/api/driver/index.php
	include/controllers/default/cockpit2/api/driver/orders/index.php
	include/controllers/default/cockpit2/api/driver/shifts/index.php
	include/views/default/cockpit2/bundle/js.phtml
	www/assets/cockpit/js/cockpit.js

2014-05-15 09:17:13 -03:00

..

index.php

Merge branch 'refs/heads/master' into Driver_Onboarding_2969

2014-05-15 09:17:13 -03:00