diff options
| author | James Booth <boothj5@gmail.com> | 2014-01-05 01:20:42 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-01-05 01:20:42 +0000 |
| commit | f569845b40057dcc90d588e46147f7694a0b5e1b (patch) | |
| tree | 79e098d84c25da9f481b2d965ae6156c4e7806ae /src/xmpp | |
| parent | e504c030a6325fc41d7daf667b2158cb31d8773e (diff) | |
| parent | 5898da963a254294ce5dd24b8a9534256f7efd45 (diff) | |
| download | profani-tty-f569845b40057dcc90d588e46147f7694a0b5e1b.tar.gz | |
Merge branch 'master' into otr
Conflicts: .gitignore
Diffstat (limited to 'src/xmpp')
0 files changed, 0 insertions, 0 deletions