Merge branch 'master' of git@stigma:platforma
authorŁukasz Rekucki <lrekucki@gmail.com>
Thu, 10 Sep 2009 15:02:03 +0000 (17:02 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Thu, 10 Sep 2009 15:02:03 +0000 (17:02 +0200)
commitf31bb368a2cad9a61e4fc652fa4b40c4114a128c
tree116555691d1eb91e629448f939dd3e28b70c68b7
parent970685936cdd7b70e3efa2f2506f66198049b16d
parent78b3d0dc3fc979d4c2ab507bf95d82b89e2792ad
Merge branch 'master' of git@stigma:platforma

Conflicts:
project/static/js/editor.js
setupUI przeniesione do editor.ui.js
project/static/js/editor.js
project/static/js/editor.ui.js
project/templates/explorer/editor.html