Revert "Merge pull request #458 from Shopify/block-body"

This reverts commit 12d526a05c, reversing
changes made to 263e90e772.

Conflicts:
	lib/liquid/block_body.rb
This commit is contained in:
Florian Weingarten
2014-11-07 01:47:47 +00:00
parent 2fe3a21a5d
commit 4b1835e3c0
16 changed files with 154 additions and 128 deletions
-1
View File
@@ -3,7 +3,6 @@
## 3.0.0 / not yet released / branch "master"
* ...
* Block parsing moved to BlockBody class, see #458 [Dylan Thacker-Smith, dylanahsmith]
* Removed Block#end_tag. Instead, override parse with `super` followed by your code. See #446 [Dylan Thacker-Smith, dylanahsmith]
* Fixed condition with wrong data types, see #423 [Bogdan Gusiev]
* Add url_encode to standard filters, see #421 [Derrick Reimer, djreimer]