Skip to content

Release/update develop with 1.25.0 master#2112

Merged
SergioEstevao merged 59 commits intodevelopfrom
release/update_develop_with_1.25.0_master
Apr 6, 2020
Merged

Release/update develop with 1.25.0 master#2112
SergioEstevao merged 59 commits intodevelopfrom
release/update_develop_with_1.25.0_master

Conversation

@SergioEstevao
Copy link
Copy Markdown
Contributor

Update develop branch with release 1.25 from master

To test:

  • Check if the demo apps are working ok
  • Check dark mode in Android is correct

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

SergioEstevao and others added 22 commits March 31, 2020 22:27
# Conflicts:
#	RNTAztecView.podspec
#	bundle/android/App.js
#	bundle/android/App.js.map
#	bundle/android/raw/i18ncache_data_ar.json
#	bundle/android/raw/i18ncache_data_bg.json
#	bundle/android/raw/i18ncache_data_bo.json
#	bundle/android/raw/i18ncache_data_ca.json
#	bundle/android/raw/i18ncache_data_cs.json
#	bundle/android/raw/i18ncache_data_cy.json
#	bundle/android/raw/i18ncache_data_da.json
#	bundle/android/raw/i18ncache_data_de.json
#	bundle/android/raw/i18ncache_data_el.json
#	bundle/android/raw/i18ncache_data_enau.json
#	bundle/android/raw/i18ncache_data_enca.json
#	bundle/android/raw/i18ncache_data_engb.json
#	bundle/android/raw/i18ncache_data_ennz.json
#	bundle/android/raw/i18ncache_data_enza.json
#	bundle/android/raw/i18ncache_data_es.json
#	bundle/android/raw/i18ncache_data_esar.json
#	bundle/android/raw/i18ncache_data_escl.json
#	bundle/android/raw/i18ncache_data_escr.json
#	bundle/android/raw/i18ncache_data_fa.json
#	bundle/android/raw/i18ncache_data_fr.json
#	bundle/android/raw/i18ncache_data_gl.json
#	bundle/android/raw/i18ncache_data_he.json
#	bundle/android/raw/i18ncache_data_hr.json
#	bundle/android/raw/i18ncache_data_hu.json
#	bundle/android/raw/i18ncache_data_id.json
#	bundle/android/raw/i18ncache_data_is.json
#	bundle/android/raw/i18ncache_data_it.json
#	bundle/android/raw/i18ncache_data_ja.json
#	bundle/android/raw/i18ncache_data_ka.json
#	bundle/android/raw/i18ncache_data_ko.json
#	bundle/android/raw/i18ncache_data_nb.json
#	bundle/android/raw/i18ncache_data_nl.json
#	bundle/android/raw/i18ncache_data_nlbe.json
#	bundle/android/raw/i18ncache_data_pl.json
#	bundle/android/raw/i18ncache_data_pt.json
#	bundle/android/raw/i18ncache_data_ptbr.json
#	bundle/android/raw/i18ncache_data_ro.json
#	bundle/android/raw/i18ncache_data_ru.json
#	bundle/android/raw/i18ncache_data_sk.json
#	bundle/android/raw/i18ncache_data_sq.json
#	bundle/android/raw/i18ncache_data_sr.json
#	bundle/android/raw/i18ncache_data_sv.json
#	bundle/android/raw/i18ncache_data_th.json
#	bundle/android/raw/i18ncache_data_tr.json
#	bundle/android/raw/i18ncache_data_uk.json
#	bundle/android/raw/i18ncache_data_ur.json
#	bundle/android/raw/i18ncache_data_vi.json
#	bundle/android/raw/i18ncache_data_zhcn.json
#	bundle/android/raw/i18ncache_data_zhtw.json
#	bundle/ios/App.js
#	bundle/ios/App.js.map
#	bundle/ios/assets/i18n-cache/data/ar.json
#	bundle/ios/assets/i18n-cache/data/bg.json
#	bundle/ios/assets/i18n-cache/data/bo.json
#	bundle/ios/assets/i18n-cache/data/ca.json
#	bundle/ios/assets/i18n-cache/data/cs.json
#	bundle/ios/assets/i18n-cache/data/cy.json
#	bundle/ios/assets/i18n-cache/data/da.json
#	bundle/ios/assets/i18n-cache/data/de.json
#	bundle/ios/assets/i18n-cache/data/el.json
#	bundle/ios/assets/i18n-cache/data/en-au.json
#	bundle/ios/assets/i18n-cache/data/en-ca.json
#	bundle/ios/assets/i18n-cache/data/en-gb.json
#	bundle/ios/assets/i18n-cache/data/en-nz.json
#	bundle/ios/assets/i18n-cache/data/en-za.json
#	bundle/ios/assets/i18n-cache/data/es-ar.json
#	bundle/ios/assets/i18n-cache/data/es-cl.json
#	bundle/ios/assets/i18n-cache/data/es-cr.json
#	bundle/ios/assets/i18n-cache/data/es.json
#	bundle/ios/assets/i18n-cache/data/fa.json
#	bundle/ios/assets/i18n-cache/data/fr.json
#	bundle/ios/assets/i18n-cache/data/gl.json
#	bundle/ios/assets/i18n-cache/data/he.json
#	bundle/ios/assets/i18n-cache/data/hr.json
#	bundle/ios/assets/i18n-cache/data/hu.json
#	bundle/ios/assets/i18n-cache/data/id.json
#	bundle/ios/assets/i18n-cache/data/is.json
#	bundle/ios/assets/i18n-cache/data/it.json
#	bundle/ios/assets/i18n-cache/data/ja.json
#	bundle/ios/assets/i18n-cache/data/ka.json
#	bundle/ios/assets/i18n-cache/data/ko.json
#	bundle/ios/assets/i18n-cache/data/nb.json
#	bundle/ios/assets/i18n-cache/data/nl-be.json
#	bundle/ios/assets/i18n-cache/data/nl.json
#	bundle/ios/assets/i18n-cache/data/pl.json
#	bundle/ios/assets/i18n-cache/data/pt-br.json
#	bundle/ios/assets/i18n-cache/data/pt.json
#	bundle/ios/assets/i18n-cache/data/ro.json
#	bundle/ios/assets/i18n-cache/data/ru.json
#	bundle/ios/assets/i18n-cache/data/sk.json
#	bundle/ios/assets/i18n-cache/data/sq.json
#	bundle/ios/assets/i18n-cache/data/sr.json
#	bundle/ios/assets/i18n-cache/data/sv.json
#	bundle/ios/assets/i18n-cache/data/th.json
#	bundle/ios/assets/i18n-cache/data/tr.json
#	bundle/ios/assets/i18n-cache/data/uk.json
#	bundle/ios/assets/i18n-cache/data/ur.json
#	bundle/ios/assets/i18n-cache/data/vi.json
#	bundle/ios/assets/i18n-cache/data/zh-cn.json
#	bundle/ios/assets/i18n-cache/data/zh-tw.json
#	gutenberg
#	ios/Podfile.lock
#	package.json
Co-Authored-By: etoledom <etoledom@icloud.com>
…rk-mode

Dark Mode on Android put on the v1.25.0 release
@SergioEstevao SergioEstevao added this to the 1.25 milestone Apr 3, 2020
@SergioEstevao SergioEstevao requested review from Tug, etoledom and hypest April 3, 2020 18:41
Copy link
Copy Markdown
Contributor

@etoledom etoledom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@SergioEstevao SergioEstevao merged commit c05d991 into develop Apr 6, 2020
@SergioEstevao SergioEstevao deleted the release/update_develop_with_1.25.0_master branch April 6, 2020 11:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants