Merge branch 'master' of stigma:platforma
authorŁukasz Rekucki <lrekucki@gmail.com>
Thu, 8 Oct 2009 10:40:01 +0000 (12:40 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Thu, 8 Oct 2009 10:40:01 +0000 (12:40 +0200)
commitde93104a2513acc5a378496c6bf6ab7ed0d45d60
treeadda8b8e6e38bc1c13dec1e6e246874eb2ad3602
parent1d07e208b0897af64f71755c974762bc7cd19ca0
parent359e0f406798548adbf6f0768c3e5c4cd20cbe7b
Merge branch 'master' of stigma:platforma

Conflicts:
project/static/css/master.css
project/static/js/models.js
project/static/css/master.css
project/static/js/models.js
project/templates/explorer/editor.html