Yan e09559c508 merge with august spring but merge fail

2017-08-31 15:58:01 +06:30

..

migrate

for pull

2017-08-31 10:22:21 +06:30

order_inputs_from_emenu

…

scaffold_structure

shift close and payment journal

2017-06-28 10:34:42 +06:30

schema.txt

…

seeds.rb

update seed for tasty osaka

2017-08-24 15:26:46 +06:30

sym_master.sql

update sync sql

2017-08-29 18:06:09 +06:30