projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
[akkoma]
/
lib
/
pleroma
/
uploaders
/
swift
/
keystone.ex
diff --git
a/lib/pleroma/uploaders/swift/keystone.ex
b/lib/pleroma/uploaders/swift/keystone.ex
index b4f250f9d99fbabdfdba2a7f4bf2bf0041882247..3046cdbd2e374f231ba7683f190882cc095767f8 100644
(file)
--- a/
lib/pleroma/uploaders/swift/keystone.ex
+++ b/
lib/pleroma/uploaders/swift/keystone.ex
@@
-17,7
+17,7
@@
defmodule Pleroma.Uploaders.Swift.Keystone do
|> Poison.decode!()
end
- def get_token
()
do
+ def get_token do
settings = Pleroma.Config.get(Pleroma.Uploaders.Swift)
username = Keyword.fetch!(settings, :username)
password = Keyword.fetch!(settings, :password)