diff options
| author | mathieui <mathieui@mathieui.net> | 2014-10-14 15:51:30 +0200 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2014-10-14 15:51:30 +0200 |
| commit | 545ad1bd71e87a482b357f5b49a0898be73478d8 (patch) | |
| tree | e513febd81f0c3d338b047f0672e5353e92534d4 /Makefile | |
| parent | 37fe4be7ec35278f23c9f5c07607c3a14e6b6753 (diff) | |
| parent | 088c6c6a0b46309d17c4b0ba5939a2dd200c7002 (diff) | |
| download | poezio-545ad1bd71e87a482b357f5b49a0898be73478d8.tar.gz poezio-545ad1bd71e87a482b357f5b49a0898be73478d8.tar.bz2 poezio-545ad1bd71e87a482b357f5b49a0898be73478d8.tar.xz poezio-545ad1bd71e87a482b357f5b49a0898be73478d8.zip | |
Merge branch 'master' of git.poez.io:poezio into slix
Conflicts:
src/core/handlers.py
src/tabs/xmltab.py
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions