NativeScript

mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-18 22:01:42 +08:00

Files

Martin Guillon e6598aee0f Merge branch 'master' of github.com:NativeScript/NativeScript

# Conflicts:
#	apps/automated/src/test-runner.ts
#	apps/automated/src/ui/bottom-navigation/bottom-navigation-navigation-tests.ts
#	apps/ui/src/bottom-navigation/events-page.ts
#	apps/ui/src/main-page.ts
#	apps/ui/src/test-page-main-view-model.ts
#	package.json
#	packages/core/color/color-common.ts
#	packages/core/color/index.d.ts
#	packages/core/ui/action-bar/index.android.ts
#	packages/core/ui/bottom-navigation/index.android.ts
#	packages/core/ui/core/view/index.ios.ts
#	packages/core/ui/core/view/view-helper/view-helper-common.ts
#	packages/core/ui/index.ts
#	packages/core/ui/styling/background.android.ts
#	packages/core/ui/tab-navigation-base/tab-strip-item/index.ts
#	packages/webpack/jasmine-config/reporter.ts

2021-04-08 16:36:02 +02:00

gradle/wrapper

chore(core): monorepo, esm targeting, improved management (#8707 )

2020-08-25 20:00:59 -07:00

widgets

Merge branch 'master' of github.com:NativeScript/NativeScript

2021-04-08 16:36:02 +02:00

.gitignore

chore(core): monorepo, esm targeting, improved management (#8707 )

2020-08-25 20:00:59 -07:00

build.gradle

chore(core): monorepo, esm targeting, improved management (#8707 )