phyusin bd06e80b37 remove conflict data

2018-03-05 16:24:45 +06:30

..

api

change person item code process

2018-01-23 15:02:50 +06:30

crm

add membership type in customer

2017-12-29 12:02:40 +06:30

home

remove conflict data

2018-03-05 16:24:45 +06:30

install

…

inventory

…

kaminari

…

layouts

remove conflict data

2018-03-05 16:24:45 +06:30

oqs

remove conflict data

2018-02-27 14:35:21 +06:30

origami

remove conflict data

2018-03-05 16:24:45 +06:30

print_settings

add printer lists of system

2018-01-16 11:39:37 +06:30

reports

merge with Old Town Req

2018-03-05 15:10:36 +06:30

settings

add interger checked for promotions

2018-01-25 10:37:05 +06:30

sym_control

license key api for redis

2018-01-12 15:07:22 +06:30

transactions

…