3 commits

Author	SHA1	Message	Date
Khanh Ngo	80b6ca19ac	Resolve the conflicts and add adjustment to #591	2019-12-06 14:27:35 +07:00
Khanh Ngo	8de6df4d3b	Fix the tests ... Fix the tests Fix the tests	2019-12-06 10:59:19 +07:00
Khanh Ngo	840e2a4750	Update docker stuff and bug fixes	2019-12-04 11:50:46 +07:00