|
37c8a846c7
|
Merge branch 'master' of github.com:NativeScript/NativeScript
# Conflicts:
# .gitignore
# apps/ui/src/tabs/frame-in-tabs-inner-page-1.xml
# apps/ui/src/tabs/main-page.ts
# apps/ui/src/tabs/swipe-disabled-page.xml
# apps/ui/src/tabs/tabs-position-page.xml
# package.json
# packages/core/package.json
# packages/core/ui/core/view-base/index.d.ts
# packages/core/ui/core/view-base/index.ts
# packages/core/ui/core/view/index.android.ts
# packages/core/ui/tabs/index.android.ts
# packages/core/ui/tabs/index.ios.ts
# packages/core/ui/tabs/tabs-common.ts
|
2021-01-19 13:44:42 +01:00 |
|