Skip to content

Commit edec2b9

Browse files
naumov-socolovnaumov-socolov
committed
Merge branch 'patch-3' of https://github.com/myrevery/vesta into myrevery-patch-3
Conflicts: web/inc/i18n/cn.php
2 parents e2e51d0 + 2cbd8e2 commit edec2b9

1 file changed

Lines changed: 403 additions & 400 deletions

File tree

0 commit comments

Comments
 (0)