1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00

Merge remote-tracking branch 'origin/encukou-whoosh'

Conflicts:
	setup.py
This commit is contained in:
Eevee 2011-09-06 23:33:08 -07:00
commit 66988fb070
2 changed files with 8 additions and 36 deletions

View file

@ -9,7 +9,7 @@ setup(
},
install_requires=[
'SQLAlchemy>=0.7',
'whoosh>=1.1.0',
'whoosh>=2.2.2',
'markdown',
'construct',
],