Nweni 417d64ecae fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30

..

api

order from app

2019-11-28 15:52:50 +06:30

crm

shop code

2019-11-22 18:24:02 +06:30

foodcourt

app order

2019-12-02 17:48:36 +06:30

home

fixed conflict after merge with dev

2019-11-28 16:47:12 +06:30

induties/assign_in_duties

…

install

…

inventory

shop code

2019-11-22 18:24:02 +06:30

kaminari

…

layouts

fixed conflict

2019-12-02 17:43:02 +06:30

oqs

shop code

2019-11-22 18:24:02 +06:30

origami

fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30

print_settings

…

reports

fixed conflict

2019-11-28 14:19:37 +06:30

settings

…

sym_control

…

transactions

fixed conflict

2019-12-02 17:43:02 +06:30