Commit Graph

5 Commits

Author SHA1 Message Date
Fabien Potencier 6b5e02f47d Merge branch '3.x' into 4.x
* 3.x:
  Allow block chains to be composed of other block chains
2026-09-14 11:27:09 +02:00
Fabien Potencier d6b81f9074 Allow block chains to be composed of other block chains 2026-09-14 11:17:44 +02:00
Fabien Potencier 620783d2b1 Fix merge conflict resolution 2026-09-12 10:00:48 +02:00
Fabien Potencier 897717d78f Resolve block chains against the render context instead of freezing lineages 2026-09-12 00:03:19 +02:00
Fabien Potencier 49f814ea26 Template runtime and block composition 2026-09-11 04:57:38 -07:00