Merge from master and update submodules
This commit is contained in:
commit
a12c96384b
|
@ -63,7 +63,7 @@ import {ResourcesService} from "./openaireLibrary/monitor/services/resources.ser
|
||||||
<bottom *ngIf="properties && showMenu" [grantAdvance]="false"
|
<bottom *ngIf="properties && showMenu" [grantAdvance]="false"
|
||||||
[properties]="properties"></bottom>
|
[properties]="properties"></bottom>
|
||||||
<quick-contact #quickContact *ngIf="showQuickContact && contactForm" (sendEmitter)="send($event)"
|
<quick-contact #quickContact *ngIf="showQuickContact && contactForm" (sendEmitter)="send($event)"
|
||||||
[contactForm]="contactForm" [sending]="sending" [images]="images"
|
[contactForm]="contactForm" [sending]="sending" [images]="images" [contact]="'Help'"
|
||||||
[organizationTypes]="organizationTypes"></quick-contact>
|
[organizationTypes]="organizationTypes"></quick-contact>
|
||||||
<modal-alert #modal [overflowBody]="false"></modal-alert>
|
<modal-alert #modal [overflowBody]="false"></modal-alert>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 3b46fc74c15e26bc1feb3ad71ba7473b9a9aaceb
|
Subproject commit 8677e9dcd5dbe949b23e102dc8aa374e0e43d170
|
|
@ -1 +1 @@
|
||||||
Subproject commit 8bb758b340d05b50b65da48863ff7ed69fdc122b
|
Subproject commit f902074e00e01165f489e2fef12aad6551c03ccd
|
Loading…
Reference in New Issue