Main repo merge#1

Open

TerenceJefferies wants to merge 20 commits intomasterfrom

main-repo-merge

Commits on Sep 1, 2016

Travis: run tests on more recent versions of PHP (5.6, 7.0)
Petr Kotek
committed
Travis: run on new container infrastructure
Petr Kotek
committed

Commits on Sep 2, 2016

Merge pull request #101 from petrkotek/travis-update
Henry Smith
authored

Commits on Jan 30, 2017

Fixes #107 for twig up to v1.30.0
martinr
committed
Add composer flag: prefer-stable: true
martinr
committed
Libraries should not include a composer.lock file
martinr
committed
Relax twig version requirements
martinr
committed
Update composer.json
DerManoMann
authored

Commits on Jan 31, 2017

Merge pull request #112 from DerManoMann/parent_node
Henry Smith
authored
Merge branch 'master' into no_lock
martinr
committed
ignore composer.lock
martinr
committed
Merge branch 'master' into prefer_stable
martinr
committed
Merge pull request #114 from DerManoMann/no_lock
Henry Smith
authored
Merge branch 'master' into prefer_stable
martinr
committed

Commits on Feb 1, 2017

Merge pull request #113 from DerManoMann/prefer_stable
Henry Smith
authored

Commits on Jan 10, 2019

Additional patches for twig v1.25+
jstuhli
committed

Commits on Jan 12, 2019

Merge branch 'fix-119'
Henry Smith
committed

Commits on Sep 6, 2019

Merge branch 'master' of github.com:schmittjoh/twig.js into main-repo-merge
Terence Jefferies
committed
Add compiler for ModuleNode
Terence Jefferies
committed
Add namespaces class compilation
Terence Jefferies
committed