This commit is contained in:
parent
ae7291d4f1
commit
307095bfd0
@ -57,10 +57,7 @@ class XmppSetAvatarJob < ApplicationJob
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
# See https://xmpp.org/extensions/xep-0084.html
|
# See https://xmpp.org/extensions/xep-0084.html
|
||||||
>>>>>>> feature/ejabberd_pep
|
|
||||||
def build_xep0084_stanzas
|
def build_xep0084_stanzas
|
||||||
img_data = process_avatar
|
img_data = process_avatar
|
||||||
sha1_hash = Digest::SHA1.hexdigest(img_data)
|
sha1_hash = Digest::SHA1.hexdigest(img_data)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user