From: Fabien Potencier Date: Mon, 19 Mar 2012 18:52:05 +0000 (+0100) Subject: merged branch shieldo/patch-1 (PR #670) X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=405cbb5be259a3a5cccdb2acc892869a97ae858e;p=web%2Fkonrad%2Ftwig.git merged branch shieldo/patch-1 (PR #670) Commits ------- 7f0cca0 fixed incorrect docblock Discussion ---------- fixed incorrect docblock --------------------------------------------------------------------------- by shieldo at 2012-03-19T18:15:41Z True, and done. --------------------------------------------------------------------------- by fabpot at 2012-03-19T18:19:33Z Can you rebase your PR and squash your commits so that we don't have the merge? Thanks. --------------------------------------------------------------------------- by shieldo at 2012-03-19T18:43:28Z Sorry about that. Done. :) --- 405cbb5be259a3a5cccdb2acc892869a97ae858e