Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
authorzuber <marek@stepniowski.com>
Tue, 29 Sep 2009 14:40:34 +0000 (16:40 +0200)
committerzuber <marek@stepniowski.com>
Tue, 29 Sep 2009 14:40:34 +0000 (16:40 +0200)
commit3546a2b2d5f52224bcf95803030611ab505f29cd
treecb6174d0b480871ac5cb4cbb783ab6ac04f6e4ee
parentab093330473e6cee879256b9902ce90bd1832c35
parent4ed56f84dedf9da88708fc2c4aef3b0b11f30825
Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

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