aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-10/+39
* Move a chunk of classes over to using JID objectsSam Whited2014-11-091-1/+3
* Make conversations the root projectSam Whited2014-10-221-0/+71