Merge branch 'v20' of http://192.168.31.240:3000/MTP2.0_New/MTP20_WEB_GLOBAL into v20

public/locales/en-US.json

@@ -873,7 +873,7 @@
         }
     },
     "delivery": {
-        "title": "Delivery Pick Up",
+        "title": "Delivery & PickUp",
         "online": {
             "title": "Online",
             "title2": "History Online Order",