diff options
| author | lookshe <github@lookshe.org> | 2016-03-06 19:42:55 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-06 19:42:55 +0100 |
| commit | 3c400703e082a1b180b35d891b8fb3460c7d5b87 (patch) | |
| tree | 28738dd90fc41b4ab71897f38d324828778ad2e3 /src/main/java/de/thedevstack/conversationsplus/xmpp/pep | |
| parent | 72114d732427266024cdd6e27cd8d1aa60afae2f (diff) | |
| parent | f28d77dc42f6bac5a026e0b1c78562dee8de45ac (diff) | |
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/pep')
| -rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/pep/Avatar.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/pep/Avatar.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/pep/Avatar.java index 31fda8fd..9c1c8b9c 100644 --- a/src/main/java/de/thedevstack/conversationsplus/xmpp/pep/Avatar.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/pep/Avatar.java @@ -1,10 +1,10 @@ package de.thedevstack.conversationsplus.xmpp.pep; +import android.util.Base64; + import de.thedevstack.conversationsplus.xml.Element; import de.thedevstack.conversationsplus.xmpp.jid.Jid; -import android.util.Base64; - public class Avatar { public enum Origin { PEP, VCARD }; |