aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/pep (unfollow)
Commit message (Expand)AuthorFilesLines
2015-08-11Merge tag '1.5.2' into trz/rebaselookshe1-10/+39
2014-11-09Move a chunk of classes over to using JID objectsSam Whited1-1/+3
2014-10-22Make conversations the root projectSam Whited1-0/+71