Aung Myo 406172c6ff fixed conflict

2017-06-09 12:04:36 +06:30

..

_header_crm.html.erb

update crm layout

2017-06-09 11:55:50 +06:30

_header_oqs.html.erb

more controller for cashier/waiter view

2017-05-10 01:10:21 +06:30

_header_orgiami.html.erb

…

_header.html.erb

update top menu bar for report

2017-06-09 11:59:08 +06:30

application.html.erb

UI phrase 1

2017-06-01 17:10:04 +06:30

CRM.html.erb

update crm layout

2017-06-09 11:55:50 +06:30

installation.html.erb

…

mailer.html.erb

…

mailer.text.erb

…

OQS.html.erb

…

origami.html.erb

updated miss origami css and js filename

2017-06-09 10:35:19 +06:30

waiter.html.erb

…