Merge upstream changes

RolfBabijn released this 22 Nov 10:04

· 7 commits to master since this release

faaafd4

Merge latest changes from schmittjoh repository (#5)

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

Change twig dep to ^1.25 rather than ^1.24
* ignore composer.lock

Assets 2