Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma
authorzuber <marek@stepniowski.com>
Fri, 28 Aug 2009 10:48:24 +0000 (12:48 +0200)
committerzuber <marek@stepniowski.com>
Fri, 28 Aug 2009 10:48:24 +0000 (12:48 +0200)
1  2 
project/static/js/editor.js

Simple merge