Merge branch 'master' of stigma:platforma
authorŁukasz Rekucki <lrekucki@gmail.com>
Tue, 29 Sep 2009 14:57:00 +0000 (16:57 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Tue, 29 Sep 2009 14:57:00 +0000 (16:57 +0200)
commite3cc953f09c067377e01d1e003927b969997edde
treea85b902bd9d517f6448429a39474c2d8b30931f7
parent01465cea212ef30b7e580a3ff7e30a82b13ae8f8
parent3546a2b2d5f52224bcf95803030611ab505f29cd
Merge branch 'master' of stigma:platforma

Conflicts:
project/static/js/models.js
project/static/js/models.js