Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
authorzuber <marek@stepniowski.com>
Wed, 16 Sep 2009 13:08:14 +0000 (15:08 +0200)
committerzuber <marek@stepniowski.com>
Wed, 16 Sep 2009 13:08:14 +0000 (15:08 +0200)
commit8d62c0c82718b59c077b611fca1cd9f8054a8c41
tree87c8a4e358662b18166cdd41b9d992d52e37a594
parent58c5e72cdee1087d200d0c809e92c35ddeb6ad28
parente6ba3117b6791a88ffef8ddecb310b5d514780e9
Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
project/static/js/editor.js
project/templates/explorer/editor.html