diff options
| author | mathieui <mathieui@mathieui.net> | 2014-10-31 19:15:57 +0100 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2014-10-31 19:16:44 +0100 |
| commit | 1c1ab3cb839e5509db52770e10c7190f844eb2e5 (patch) | |
| tree | b331060b3dc42651e61e4ccb2dfe6af5e2e97752 /data/poezio_80.png | |
| parent | cedc5a6ec80a46437f42464415fd1806049c593d (diff) | |
| parent | ea2b703bfd07d293ba9fdd85ac657275d43da2a7 (diff) | |
| download | poezio-1c1ab3cb839e5509db52770e10c7190f844eb2e5.tar.gz poezio-1c1ab3cb839e5509db52770e10c7190f844eb2e5.tar.bz2 poezio-1c1ab3cb839e5509db52770e10c7190f844eb2e5.tar.xz poezio-1c1ab3cb839e5509db52770e10c7190f844eb2e5.zip | |
Merge branch 'master' of git.poez.io:poezio into slix
Conflicts:
src/bookmark.py
src/config.py
src/connection.py
src/core/commands.py
src/core/core.py
src/core/handlers.py
src/windows/info_bar.py
src/windows/muc.py
src/windows/roster_win.py
src/windows/text_win.py
src/xhtml.py
Diffstat (limited to 'data/poezio_80.png')
0 files changed, 0 insertions, 0 deletions