mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-08-17 21:01:34 +08:00
e3e5dea2be
# Conflicts: # package.json # packages/core/bundle-entry-points.ts # packages/core/color/color-common.ts # packages/core/color/index.d.ts # packages/core/globals/index.ts # packages/core/package.json # packages/core/ui/core/bindable/index.ts # packages/core/ui/core/properties/index.ts # packages/core/ui/core/view/index.android.ts # packages/core/ui/frame/index.android.ts # packages/core/ui/styling/style-scope.ts # packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.properties # packages/webpack5/package.json # packages/webpack5/src/configuration/base.ts