Merge branch 'master' of git@stigma:platforma
authorŁukasz Rekucki <lrekucki@gmail.com>
Fri, 28 Aug 2009 09:53:13 +0000 (11:53 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Fri, 28 Aug 2009 09:53:13 +0000 (11:53 +0200)
commit0602376974810e6709409a69b010c5a68b5c3040
tree09b63d9412f3ca41e6ca8454161bb0cc71c4c9c6
parent203796649b4f3498c6b05adef07fc8cb1ee63f3b
parent1177b1bdf74626d1edf681ae530e9d5f2e1a76a8
Merge branch 'master' of git@stigma:platforma

Conflicts:

project/static/js/editor.js
project/templates/explorer/editor.html
project/static/js/editor.js
project/templates/explorer/editor.html