Skip to Content

Name: Fwd from 18 to 19 261009 01

State: Failed finished in 167m

PR State: merged

PR Author: David Tran

PR Author Email:

PR: #687

Committer: David Tran

Committer Email: david.tran@tvtmarine.com

Commit: 5c8e6ed3ed239d077b66ac7d92ca535e80892431

Description:

                                            Merge remote-tracking branch 'origin/18.0' into 19.0

Range 4a5885d (1 commit). Conflict resolution:

- i18n/vi_VN.po: kept the 19.0 catalog shape and entries; where 18.0
  changed a msgstr and the same msgid exists on 19.0, the 18.0 wording
  wins.
- viin_brand_common (renamed viin_brand_base_setup on 19.0): its 18.0
  msgstr change applied to viin_brand_base_setup/i18n/vi_VN.po.
- viin_brand_membership (removed on 19.0): catalog stays deleted.
                                            

Branch: 19.0

Age:

Up-time: