Merge branch 'production' into pretty
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 13 Jan 2012 16:05:36 +0000 (17:05 +0100)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 17 Jan 2012 14:17:44 +0000 (15:17 +0100)
commit73ce961f14509aabfa26536f847afd28111029c6
tree7dce6eec9d0881d7982a22af512152725cc1cd2c
parent325a7f36de2b6f38c53f6e1dc103807f66944364
parent764fcc72600a23d5093511228dee596b55c45c72
Merge branch 'production' into pretty

Conflicts:
apps/catalogue/models.py
wolnelektury/settings.py
wolnelektury/templates/catalogue/main_page.html
wolnelektury/urls.py
apps/api/handlers.py
apps/catalogue/admin.py
apps/catalogue/migrations/0024_auto__add_collection.py
apps/catalogue/models.py
apps/catalogue/urls.py
apps/catalogue/views.py
requirements.txt
wolnelektury/settings.py
wolnelektury/templates/catalogue/collection.html