Merge branch 'master' of github.com:diaspora/diaspora
This commit is contained in:
commit
fa6e12d808
1 changed files with 5 additions and 2 deletions
|
|
@ -224,8 +224,11 @@ class User
|
||||||
end
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
def generate_key
|
||||||
def generate_key
|
OpenSSL::PKey::RSA::generate 1024
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.generate_key
|
||||||
OpenSSL::PKey::RSA::generate 1024
|
OpenSSL::PKey::RSA::generate 1024
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue