Merge branch 'master' into lqc-trunk
authorLukasz Rekucki <lrekucki@gmail.com>
Sun, 8 Nov 2009 13:49:11 +0000 (14:49 +0100)
committerLukasz Rekucki <lrekucki@gmail.com>
Sun, 8 Nov 2009 13:49:11 +0000 (14:49 +0100)
commit061f517181630ee982c33aee63965b18965fd5aa
treef92bedad87e48b0031de3f9e353f8ccae5771125
parent4607903456ce2c96d5c40d72c603093ef02f5d29
parent8d490fc7810e0052bad3414b445b24276bbfca63
Merge branch 'master' into lqc-trunk
apps/api/handlers/library_handlers.py
apps/explorer/views.py
platforma/static/js/models.js
platforma/static/js/views/gallery.js
platforma/templates/explorer/editor.html
platforma/urls.py