diff options
| author | James Booth <boothj5@gmail.com> | 2015-03-14 16:41:40 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-03-14 16:41:40 +0000 |
| commit | 060dcc24e313674ec8aa353e3e203e73216eb65a (patch) | |
| tree | c7ece0681cbbf69e4df9da3b7c52b7e2daed9447 /themes/shade | |
| parent | 1014244408caa2d74278603dcbece7857e7f7d4b (diff) | |
| parent | 2fc7937dcd6949bb322bbfdd33c903792324719b (diff) | |
| download | profani-tty-060dcc24e313674ec8aa353e3e203e73216eb65a.tar.gz | |
Merge branch 'master' into xep-0184
Conflicts: src/xmpp/message.c
Diffstat (limited to 'themes/shade')
0 files changed, 0 insertions, 0 deletions