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)
Conflicts:
project/static/js/button_scripts.js

1  2 
project/static/js/button_scripts.js

Simple merge