merge 2.0.0-m3

This commit is contained in:
Maren Süwer
2018-10-18 08:37:35 +02:00
140 changed files with 34533 additions and 10482 deletions

View File

@@ -126,6 +126,7 @@ class Permissions extends React.Component<Props> {
{t("permission.group-permission")}
</th>
<th>{t("permission.type")}</th>
<th />
</tr>
</thead>
<tbody>