Merge branch 'develop' into BUDI-7403/google_integration
This commit is contained in:
commit
b4bbc44569
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "2.10.16-alpha.2",
|
"version": "2.10.16-alpha.4",
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"packages": [
|
"packages": [
|
||||||
"packages/*"
|
"packages/*"
|
||||||
|
|
|
@ -46,7 +46,9 @@
|
||||||
|
|
||||||
{#if loaded}
|
{#if loaded}
|
||||||
<div class="page">
|
<div class="page">
|
||||||
<PortalSideBar />
|
{#if $apps.length > 0}
|
||||||
|
<PortalSideBar />
|
||||||
|
{/if}
|
||||||
<slot />
|
<slot />
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
Loading…
Reference in New Issue