Skip to content
This repository has been archived by the owner on Jun 7, 2023. It is now read-only.

Conversation

cvarley100
Copy link
Contributor

@cvarley100 cvarley100 commented Jun 19, 2019

Reverts #961

Resolves a warning about using support library version 28 when compileSdkVersion is 27

@laumair laumair self-requested a review June 19, 2019 20:38
@cvarley100 cvarley100 merged commit bb933a7 into develop Jun 19, 2019
@rajivshah3 rajivshah3 deleted the revert-961-dependabot/gradle/src/mobile/android/com.android.support-appcompat-v7-28.0.0 branch June 19, 2019 20:38
rihardsgravis pushed a commit that referenced this pull request Jun 20, 2019
…bnb-17.1.0

* develop: (85 commits)
  Bump babel-eslint from 10.0.1 to 10.0.2 (#1804)
  Bump svg2ttf from 4.1.0 to 4.3.0 in /src/shared (#1764)
  New Crowdin translations (#1825)
  Mobile: Bump build no to 72 (#1824)
  New Crowdin translations (#1823)
  New Crowdin translations (#1813)
  fix: wrap all used methods in #makeTransaction in NodesManager.retry (#1812)
  feat: update redux schema before migration (#1818)
  feat: remove locally stored unhealthy nodes (#1810)
  Revert "Bump appcompat-v7 from 27.1.0 to 28.0.0 in /src/mobile/android (#961)" (#1822)
  Mobile/Android: Patch react-native-device-info (#1821)
  Mobile: Update yarn.lock (#1819)
  Desktop: Update jest snapshot files (#1820)
  Mobile Release 0.7.3 (71) (#1800)
  Mobile: Fix camera flip icon (#1807)
  Desktop: Bump version to 0.6.1 (#1798)
  Destop: Prepare release 0.6.1 (#1797)
  New Crowdin translations (#1796)
  Mobile: Add front camera support for QR scanning (#1795)
  fix: pass seedStore instance during auto promotion (#1779)
  ...

# Conflicts:
#	src/desktop/src/ui/global/Migration.js
rihardsgravis pushed a commit that referenced this pull request Jun 20, 2019
* develop: (31 commits)
  fix: handle exception if salt is missing from keychain (#1772)
  Bump babel-eslint from 10.0.1 to 10.0.2 (#1804)
  Bump svg2ttf from 4.1.0 to 4.3.0 in /src/shared (#1764)
  New Crowdin translations (#1825)
  Mobile: Bump build no to 72 (#1824)
  New Crowdin translations (#1823)
  New Crowdin translations (#1813)
  fix: wrap all used methods in #makeTransaction in NodesManager.retry (#1812)
  feat: update redux schema before migration (#1818)
  feat: remove locally stored unhealthy nodes (#1810)
  Revert "Bump appcompat-v7 from 27.1.0 to 28.0.0 in /src/mobile/android (#961)" (#1822)
  Mobile/Android: Patch react-native-device-info (#1821)
  Mobile: Update yarn.lock (#1819)
  Desktop: Update jest snapshot files (#1820)
  Mobile Release 0.7.3 (71) (#1800)
  Mobile: Fix camera flip icon (#1807)
  Desktop: Bump version to 0.6.1 (#1798)
  Destop: Prepare release 0.6.1 (#1797)
  New Crowdin translations (#1796)
  Mobile: Add front camera support for QR scanning (#1795)
  ...

# Conflicts:
#	src/shared/actions/polling.js
rihardsgravis pushed a commit that referenced this pull request Jun 21, 2019
* develop: (24 commits)
  Desktop: Prepare 0.6.2 release (#1837)
  New Crowdin translations (#1826)
  Shared: Add more verbose error log messages (#1834)
  Shared: Fix bugs associated with quorum (#1835)
  Shared: Add fallback node list api endpoints (#1811)
  fix: 0.4.x -> latest database migration (#1832)
  Try not to error in error catches (#1833)
  fix: handle exception if salt is missing from keychain (#1772)
  Bump babel-eslint from 10.0.1 to 10.0.2 (#1804)
  Bump svg2ttf from 4.1.0 to 4.3.0 in /src/shared (#1764)
  New Crowdin translations (#1825)
  Mobile: Bump build no to 72 (#1824)
  New Crowdin translations (#1823)
  New Crowdin translations (#1813)
  fix: wrap all used methods in #makeTransaction in NodesManager.retry (#1812)
  feat: update redux schema before migration (#1818)
  feat: remove locally stored unhealthy nodes (#1810)
  Revert "Bump appcompat-v7 from 27.1.0 to 28.0.0 in /src/mobile/android (#961)" (#1822)
  Mobile/Android: Patch react-native-device-info (#1821)
  Mobile: Update yarn.lock (#1819)
  ...

# Conflicts:
#	src/desktop/src/index.js
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants