Aung Myo f8df5147a4 fixed conflict file

2017-06-13 10:40:49 +06:30

..

credit_payments

update

2017-06-06 16:19:14 +06:30

customers

update customer amount

2017-06-13 10:36:40 +06:30

discounts

Update

2017-06-12 13:26:09 +06:30

home

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-13 10:00:47 +06:30

mpu

Payment route change

2017-06-12 14:22:45 +06:30

others_payments

payment

2017-06-11 16:57:31 +06:30

payments

update customer amount

2017-06-13 10:36:40 +06:30

paypar_payments

Adding Redeem at payment

2017-06-08 15:17:26 +06:30

redeem_payments

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-12 18:18:32 +06:30