Ramon Gutierrez ea4906d207 Merge branch 'master' into '13-job-order-reassignment' ... # Conflicts: # src/Controller/JobOrderController.php		2018-02-26 22:36:18 +00:00
..
form.html.twig	Add job order cancel functionality #13	2018-02-27 06:32:15 +08:00
list.assigning.html.twig	Add unlock processor and assignor feature for job order #14	2018-02-27 06:21:43 +08:00
list.fulfillment.html.twig	Add fulfillment job order list and form #15	2018-02-19 23:28:50 +08:00
list.html.twig	Fix fulfillment table bug #14	2018-02-27 06:28:31 +08:00
list.open.html.twig	Add open role to job order #13	2018-02-27 05:53:55 +08:00
list.processing.html.twig	Add unlock processor and assignor feature for job order #14	2018-02-27 06:21:43 +08:00