Merge branch 'master' of stigma:platforma
authorŁukasz Rekucki <lrekucki@gmail.com>
Thu, 8 Oct 2009 10:40:01 +0000 (12:40 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Thu, 8 Oct 2009 10:40:01 +0000 (12:40 +0200)
Conflicts:
project/static/css/master.css
project/static/js/models.js


No differences found