fnp / redakcja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: b157bbf)
Merge branch 'master' of git@stigma:platforma
authorŁukasz Rekucki <lrekucki@gmail.com>
Mon, 24 Aug 2009 15:59:05 +0000 (17:59 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Mon, 24 Aug 2009 15:59:05 +0000 (17:59 +0200)
Conflicts:

project/static/js/jquery.hpanel.js
project/static/js/panels.js
project/templates/explorer/panels/xmleditor.html


No differences found