Merge branch 'master' of stigma:platforma
authorŁukasz Rekucki <lrekucki@gmail.com>
Tue, 20 Oct 2009 12:42:45 +0000 (14:42 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Tue, 20 Oct 2009 12:42:45 +0000 (14:42 +0200)
commit0e5e4a0d816add3c0c13559fbed4f79eb295baf8
treecabfefdfadc169244d3dfc8031c6fc141fa2ad45
parentbd2f4130a81e68a2bb3c8d88448540ec60fe7be5
parentde4a58ffa2b1268afa1764b8c54a82d96a7875f6
Merge branch 'master' of stigma:platforma

Conflicts:
platforma/urls.py
apps/api/forms.py
platforma/urls.py