| commit | b1665e90626b3367d856b8994f0693b262cf8492 | |
| author | Paweł Paprota <ppawel@fastmail.fm> | |
| Sun, 8 Jun 2008 09:48:10 +0000 (8 11:48 +0200) | ||
| committer | Paweł Paprota <ppawel@fastmail.fm> | |
| Sun, 8 Jun 2008 09:48:10 +0000 (8 11:48 +0200) | ||
| tree | 67a174ee16d3be0ccc7e61d3d0c3159df3ba2a31 | treesnapshot (tar.gz zip) |
| parent | 3743836a9e36ce492839bc866efc72cffc14a129 | commitdiff |
| parent | 75ad142a960218877ec3947ad400defb9b1ace92 | commitdiff |
Merge commit 'origin/future'
Conflicts:
straw/Application.py
straw/FeedListView.py
straw/FeedManager.py
straw/ItemList.py
straw/helpers.py
straw/model/__init__.py
Conflicts:
straw/Application.py
straw/FeedListView.py
straw/FeedManager.py
straw/ItemList.py
straw/helpers.py
straw/model/__init__.py
| straw/Application.py | diff1 | diff2 | blobhistory |
| straw/FeedListView.py | diff1 | diff2 | blobhistory |