summaryrefslogtreecommitdiff
path: root/inc/lib/Twig/TokenParser/Spaceless.php
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2013-08-05 06:03:40 -0400
committerczaks <marcin@6irc.net>2013-08-05 06:03:40 -0400
commita84c4510fccfdc0cfb6f187633daea10dc70f326 (patch)
tree6077f5211196ae40cac0184bb7cc67b81d320b0b /inc/lib/Twig/TokenParser/Spaceless.php
parent33c7abf11f3a9b5c0964a2d7a25533c2849dbc78 (diff)
parenta8327c3a37fd22d2aa5d63061c9d3eaa30ae425a (diff)
Merge branch 'master' of github.com:vichan-devel/Tinyboard
Conflicts: js/post-hider.js
Diffstat (limited to 'inc/lib/Twig/TokenParser/Spaceless.php')
-rw-r--r--inc/lib/Twig/TokenParser/Spaceless.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/lib/Twig/TokenParser/Spaceless.php b/inc/lib/Twig/TokenParser/Spaceless.php
index aa7ffbc4..1e3fa8f3 100644
--- a/inc/lib/Twig/TokenParser/Spaceless.php
+++ b/inc/lib/Twig/TokenParser/Spaceless.php
@@ -50,7 +50,7 @@ class Twig_TokenParser_Spaceless extends Twig_TokenParser
/**
* Gets the tag name associated with this token parser.
*
- * @param string The tag name
+ * @return string The tag name
*/
public function getTag()
{