Merge branch 'master' of stigma:platforma
authorŁukasz Rekucki <lrekucki@gmail.com>
Tue, 29 Sep 2009 14:13:49 +0000 (16:13 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Tue, 29 Sep 2009 14:13:49 +0000 (16:13 +0200)
1  2 
project/static/js/models.js
project/templates/explorer/editor.html

Simple merge