Browse Source

Merge branch 'develop/3.0.6' into test

# Conflicts:
#	src/pages/user/agreement.vue
DESKTOP-2S67K1S\31396 2 years atrás
parent
commit
42205ca55a
1 changed files with 28 additions and 28 deletions
  1. 28 28
      src/pages/user/agreement.vue

File diff suppressed because it is too large
+ 28 - 28
src/pages/user/agreement.vue