Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-19 19:00:39 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dont_render_blank_blocks

Browse Source 
Conflicts:
	lib/liquid/tags/cycle.rb
	lib/liquid/tags/increment.rb
This commit is contained in:
Florian Weingarten
2013-06-27 10:03:18 -04:00
parent 668ee5e1c4 37309678de
commit 40a37c3fb6
66 changed files with 1943 additions and 1945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/block.rb
+1 -1
View File
@@ -106,7 +106,7 @@ module Liquid
begin
# If we get an Interrupt that means the block must stop processing. An
# Interrupt is any command that stops block execution such as {% break %}
# Interrupt is any command that stops block execution such as {% break %}
# or {% continue %}
if token.is_a? Continue or token.is_a? Break
context.push_interrupt(token.interrupt)