projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolve merge conflict
[akkoma]
/
lib
/
pleroma
/
uploaders
/
swift
/
swift.ex
diff --git
a/lib/pleroma/uploaders/swift/swift.ex
b/lib/pleroma/uploaders/swift/swift.ex
index fef426b42a6f564f9fa00b2beaeecd983b14fbcc..2b0f2ad0408f4edb39fba2cd2cc94d180a1bdf37 100644
(file)
--- a/
lib/pleroma/uploaders/swift/swift.ex
+++ b/
lib/pleroma/uploaders/swift/swift.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Uploaders.Swift.Client do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Uploaders.Swift.Client do