Merge branch 'version-2021.2'

# Conflicts: # authentik/admin/templates/administration/policy/list.html # web/src/pages/outposts/OutpostListPage.ts
2021-02-24 10:20:48 +01:00
parent 9049593ff5 e81d3dad3e
commit 5977c09b05
12 changed files with 20 additions and 20 deletions
--- a/web/src/pages/outposts/OutpostListPage.ts
+++ b/web/src/pages/outposts/OutpostListPage.ts
@ -57,7 +57,7 @@ export class OutpostListPage extends TablePage<Outpost> {
                    ${gettext("Edit")}
                </ak-spinner-button>
                <div slot="modal"></div>
-            </ak-modal-button>
+            </ak-modal-button>&nbsp;
            <ak-modal-button href="${Outpost.adminUrl(`${item.pk}/delete/`)}">
                <ak-spinner-button slot="trigger" class="pf-m-danger">
                    ${gettext("Delete")}