summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-11-08 02:15:57 +0100
committerFlorent Le Coz <louiz@louiz.org>2011-11-08 02:15:57 +0100
commitb3072bd26138913d0d65bd23bd538a87a1b182f7 (patch)
treed22f0e1704657f9e57fc8b960b7fda876419eae6 /CHANGELOG
parentb8b54735c7fe3bcdc2d3f739250b28e5facd9aef (diff)
parentd83eda6fd4fc74d5bedb1ca860c1015e7e0d3732 (diff)
downloadpoezio-b3072bd26138913d0d65bd23bd538a87a1b182f7.tar.gz
poezio-b3072bd26138913d0d65bd23bd538a87a1b182f7.tar.bz2
poezio-b3072bd26138913d0d65bd23bd538a87a1b182f7.tar.xz
poezio-b3072bd26138913d0d65bd23bd538a87a1b182f7.zip
Merge branch 'master' into plugins
Conflicts: src/tabs.py src/xhtml.py
Diffstat (limited to 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions