Merge branch 'master' into funding
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 26 Apr 2013 14:29:40 +0000 (16:29 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 26 Apr 2013 14:29:40 +0000 (16:29 +0200)
commitcda147aa999b09a14dacb097d91638f6b9cca236
tree0bdae234c8f78b2152f03afdaccced6e87174c46
parent676af187437d5baf0543cadc200efb476b062e4b
parenta06e9d248d2e085d9d071db24bc8cc1aa6dc8ed5
Merge branch 'master' into funding
apps/wolnelektury_core/views.py
requirements.txt
wolnelektury/settings/__init__.py