The branch, master has been updated via 0eab5f885825e8eaca8ac8b930718325683cc9ad (commit) from 93e415c1d6bec1214f9649b41b57cafe33ad7648 (commit)

- Log ----------------------------------------------------------------- commit 0eab5f885825e8eaca8ac8b930718325683cc9ad Author: Michal Čihař michal@cihar.com Date: Thu Jul 7 15:40:59 2011 +0200

Include both logs in single file

-----------------------------------------------------------------------

Summary of changes: website/pma-web | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/website/pma-web b/website/pma-web index 7bd29e6..6ec5aee 100755 --- a/website/pma-web +++ b/website/pma-web @@ -17,5 +17,5 @@ git pull -q --quiet-cache \ --log render.log \ --extension php > crash.log 2>&1 -cp render.log crash.log output/ +cat render.log crash.log > output/render.log rsync -az --delete output/ web.sourceforge.net:htdocs/home_page/

hooks/post-receive