Manual merge of develop into opennebula-integration
This commit is contained in:
parent
e9646c878e
commit
cb4d96604c
3 changed files with 18 additions and 12 deletions
|
|
@ -1,6 +1,7 @@
|
|||
import os
|
||||
|
||||
from django.db import models
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.functional import cached_property
|
||||
|
||||
from Crypto.PublicKey import RSA
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue