Merge branch 'master' of https://github.com/Alfresco/alfresco-content-app into pionnegru-tidyup

# Conflicts:
#	src/app/components/libraries/libraries.component.html
#	src/app/components/recent-files/recent-files.component.html
This commit is contained in:
Bogdan Cilibiu
2017-10-27 10:39:48 +03:00
6 changed files with 37 additions and 6 deletions

View File

@@ -83,7 +83,7 @@
<div class="empty-list__block">
<mat-icon>people</mat-icon>
<p class="empty-list__title">{{ 'APP.BROWSE.SHARED.EMPTY_STATE.TITLE' | translate }}</p>
<p class="empty-list__text">{{ 'APP.BROWSE.SHARED.EMPTY_STATE.TITLE' | translate }}</p>
<p class="empty-list__text">{{ 'APP.BROWSE.SHARED.EMPTY_STATE.TEXT' | translate }}</p>
</div>
</ng-template>
</empty-folder-content>