Commit Graph

3 Commits

Author SHA1 Message Date
Ivan x390
9e87130266 Merge branch 'master' of https://gitlab.com/guohuadeng/o13.odooapp.cn
# Conflicts:
#	yan.erpapp.cn
2019-12-26 03:01:59 +08:00
ivan deng
09ea4d84c7 fix delivery 2019-12-10 06:23:17 +08:00
ivan deng
e65800cda1 update apps 2019-12-09 18:07:19 +08:00