Merge branch 'master' into vue-master

2019-08-20 10:57:41 +02:00
parent a5ee26a592 c88b25c627
commit 1eeaff7f29
115 changed files with 4880 additions and 1694 deletions
--- a/templates/part.board.sidebarView.php
+++ b/templates/part.board.sidebarView.php
@@ -90,7 +90,6 @@
 				<?php p($l->t('Sharing has been disabled for your account.')); ?>
 			</li>
        </ul>
-		<h1>Collections</h1>
 		<div id="collaborationResources"></div>

    </div>