Merge branch '2.x' into 3.x

* 2.x: Fix license to use the "official" BSD wording
twigphp · Jan 31, 2020 · d291382 · d291382
2 parents 44638e9 + a086a37
commit d291382
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/LICENSE b/LICENSE
@@ -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: