Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma
authorzuber <marek@stepniowski.com>
Wed, 2 Sep 2009 10:46:45 +0000 (12:46 +0200)
committerzuber <marek@stepniowski.com>
Wed, 2 Sep 2009 10:46:45 +0000 (12:46 +0200)
commit5dd35dc51c94ec63a25ad17dca4259e7e80e2bc0
tree515b0c9eb9e2b668b335f2fd0761334a0899ec75
parentc99ae5508d64ef5063d7365cc90b5295b5686db8
parenta947b4266b1e464b54d47a7acfbeccc504b9f663
Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma

Conflicts:
apps/explorer/views.py
apps/explorer/views.py
project/static/js/editor.js