Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Revert "Upgrade TS version"" #2255

Merged
merged 1 commit into from
Dec 13, 2019

Conversation

annakaz
Copy link
Contributor

@annakaz annakaz commented Dec 13, 2019

Reverts #2251

This PR did not cause the build to break, #2254 along with this will fix the build

@cmcewen cmcewen merged commit a146651 into master Dec 13, 2019
aaronmgdr added a commit that referenced this pull request Dec 16, 2019
* master: (40 commits)
  Add utils as a dep (#2252)
  [Wallet] Create run_app.sh script to facilitate app development (#2186)
  [Wallet] Fix persisted data loss on iOS (#2249)
  adds Testing TSX /react on the web (#2229)
  Update running-a-validator.md (#2259)
  Add ts-ignore (#2254)
  Revert "Revert "Upgrade TS version (#2196)" (#2251)" (#2255)
  Force same bignumber version (#2256)
  Fix missing Text on website (#2237)
  Revert "Upgrade TS version (#2196)" (#2251)
  [Wallet] Refer to Celo Lite as "Data Saver" mode (#2232)
  Fix using requester instead of requestee at Outgoing notifications (#2240)
  Use correct phone placeholder depending on the country on joining Celo view (#2061)
  Update Attestation Bot Docker Image (#2231)
  Baklava phase 1.1 .env file (#2226)
  [Docs] Fix typo (#2225)
  Upgrade Dependencies and get react hooks working (#2203)
  Update attestation service docker images (#2202)
  Updates TME docker images (#2200)
  Remove walletkit from celotool transactions commands (#2206)
  ...

# Conflicts:
#	packages/web/package.json
aaronmgdr added a commit that referenced this pull request Dec 16, 2019
* master:
  Add utils as a dep (#2252)
  [Wallet] Create run_app.sh script to facilitate app development (#2186)
  [Wallet] Fix persisted data loss on iOS (#2249)
  adds Testing TSX /react on the web (#2229)
  Update running-a-validator.md (#2259)
  Add ts-ignore (#2254)
  Revert "Revert "Upgrade TS version (#2196)" (#2251)" (#2255)
  Force same bignumber version (#2256)
  Fix missing Text on website (#2237)
  Revert "Upgrade TS version (#2196)" (#2251)
  [Wallet] Refer to Celo Lite as "Data Saver" mode (#2232)
  Fix using requester instead of requestee at Outgoing notifications (#2240)
  Use correct phone placeholder depending on the country on joining Celo view (#2061)
  Update Attestation Bot Docker Image (#2231)
  Baklava phase 1.1 .env file (#2226)
  [Docs] Fix typo (#2225)
  Upgrade Dependencies and get react hooks working (#2203)
  Update attestation service docker images (#2202)
  Updates TME docker images (#2200)
  Remove walletkit from celotool transactions commands (#2206)
@annakaz annakaz deleted the revert-2251-revert-2196-cmcewen/upgrade-ts branch December 17, 2019 22:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants