# Conflicts: # dev_requirements.txt # requirements.txt
-update requirements.txt and dev_requirements.txt to more recent version -setup.py updated to Ubuntu 14.04 rather than 12.04 backports -request at least Pillow 3.1.1 now (since this makes jpeg/png mandatory)