Merge branch '2.x' into 3.x

* 2.x:
  Fix license to use the "official" BSD wording
This commit is contained in:
Fabien Potencier
2020-01-31 09:01:39 +01:00
-2
View File
@@ -1,7 +1,5 @@
Copyright (c) 2009-2020 by the Twig Team.
Some rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met: