Merge branch 'master' of stigma:platforma
authorŁukasz Rekucki <lrekucki@gmail.com>
Mon, 5 Oct 2009 11:07:42 +0000 (13:07 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Mon, 5 Oct 2009 11:07:42 +0000 (13:07 +0200)
commit3b9b115efb44c7570453c0729f05f83a3b45cd4d
treee358be4ae2dfb58e1a78acd3abaf793dba399f24
parent9feffcf1e18f73cbf75265533a70c5e252ce0748
parent333700b34cb944ab49d1c9243f7193d50d25ebd1
Merge branch 'master' of stigma:platforma

Conflicts:
project/static/js/button_scripts.js
project/static/js/button_scripts.js