diff options
| author | yvesf <yvesf-git@xapek.org> | 2010-11-24 21:44:28 +0100 |
|---|---|---|
| committer | yvesf <yvesf-git@xapek.org> | 2010-11-24 21:44:28 +0100 |
| commit | 0d256d1dacb1d38105859a717db0e05062d89c74 (patch) | |
| tree | 7d7f4e766a7c94724267414a87e7dd5f527c231e /static/development-bundle/demos/slider/slider-vertical.html | |
| parent | 35efef41d80413481167f9a3ec779a85c7800e4b (diff) | |
| parent | 708137185642f408427372300144412a4102ec38 (diff) | |
| download | booksearch-0d256d1dacb1d38105859a717db0e05062d89c74.tar.gz booksearch-0d256d1dacb1d38105859a717db0e05062d89c74.zip | |
Merge branch 'master' of ssh://192.168.0.6/home/yvesf/virtualenv/booksearch into HEAD
Conflicts:
indexer.py
Diffstat (limited to 'static/development-bundle/demos/slider/slider-vertical.html')
0 files changed, 0 insertions, 0 deletions