Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
authorzuber <marek@stepniowski.com>
Thu, 15 Oct 2009 16:33:42 +0000 (18:33 +0200)
committerzuber <marek@stepniowski.com>
Thu, 15 Oct 2009 16:33:42 +0000 (18:33 +0200)
commit3193141f55df20910cf8ba35f9e669d79c90d3f4
treefb139297adc4799339109555af3efd5c04003c29
parent631815265199e5299369d67a01afd21eb9eddf91
parent39d26aa0f2cb893f19282657b2fddd2a494f2263
Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

Conflicts:
platforma/templates/explorer/edit_dc.html
platforma/templates/explorer/edit_text.html
platforma/templates/explorer/file_html.html
platforma/templates/explorer/split.html
platforma/templates/explorer/split_success.html
platforma/static/css/master.css
platforma/static/js/app.js
platforma/static/js/messages.js
platforma/static/js/models.js
platforma/static/js/views/editor.js
platforma/static/js/views/flash.js
platforma/static/js/views/html.js
platforma/static/js/views/view.js
platforma/static/js/views/xml.js
platforma/templates/explorer/editor.html
platforma/templates/manager/pull_request.html