]> git.parisson.com Git - timeside.git/commit
Fix conflicts before merge
authorThomas Fillon <thomas@parisson.com>
Thu, 31 Oct 2013 17:10:38 +0000 (18:10 +0100)
committerThomas Fillon <thomas@parisson.com>
Thu, 31 Oct 2013 17:10:38 +0000 (18:10 +0100)
commit5ca994a4032d8aac775394196b28ca11be59bb4e
tree0cd5267ea6c15485d217e418f4bc8a53e1c4c5a6
parent4cda4d7a5a0636e42cf39e761b2344e8c18f8c3f
parentcfb795ad383f69e60d5fbdcd4283aa2145056827
Fix conflicts before merge
timeside/api.py
timeside/core.py