Changeset 436:d36fef19c609


Ignore:
Timestamp:
Apr 23, 2012 6:03:51 PM (13 months ago)
Author:
slav0nic <slav0nic0@…>
Branch:
default
Parents:
435:450b7f116d2e (diff), 433:d71b7ef40c2e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge with stable

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • setup.py

    r431 r436  
    1313    include_package_data=True, 
    1414    install_requires=[ 
    15             'django>=1.2', 
     15            'django>=1.3.1', 
    1616            'pil>=1.1.7', 
    1717            'django-messages==0.4.4', 

  • setup.py

    r387 r436  
    1313    include_package_data=True, 
    1414    install_requires=[ 
    15             'django>=1.2', 
     15            'django>=1.3.1', 
    1616            'pil>=1.1.7', 
    1717            'django-messages==0.4.4', 
    1818            'django-haystack', 
     19            'django-pagination', 
    1920            'south', 
    2021            'postmarkup', 
Note: See TracChangeset for help on using the changeset viewer.