NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-21 21:02:23 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
Jeremy Stretch
2024-03-15 12:32:54 -04:00
parent b58c85cdb0 4adb44f60d
commit 78bd7dec48
28 changed files with 152 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/vpn/admin.py
View File

@@ -1,3 +0,0 @@
from django.contrib import admin
# Register your models here.

2
netbox/vpn/choices.py
View File

@@ -124,7 +124,7 @@ class EncryptionAlgorithmChoices(ChoiceSet):
(ENCRYPTION_AES256_CBC, '256-bit AES (CBC)'),
(ENCRYPTION_AES256_GCM, '256-bit AES (GCM)'),
(ENCRYPTION_3DES, '3DES'),
(ENCRYPTION_3DES, 'DES'),
(ENCRYPTION_DES, 'DES'),
)