Skip to content

Commit

Permalink
Merge branch '2.x' into 3.x
Browse files Browse the repository at this point in the history
* 2.x:
  Move Drupal test file to tests/
  fix file permissions
  Bump version
  Prepare the 2.14.6 release
  Bump version
  Prepare the 1.44.4 release
  • Loading branch information
fabpot committed May 18, 2021
2 parents 00a988f + 66fa6d3 commit 4e479f1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,5 +169,5 @@ jobs:
# ini-values: memory_limit=-1
# tools: composer:v2
#
# - run: ./drupal_test.sh
# - run: bash ./tests/drupal_test.sh
# shell: "bash"
12 changes: 10 additions & 2 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,11 @@
* bumped minimum PHP version to 7.2
* removed PSR-0 classes

# 2.14.6 (2021-XX-XX)
# 2.14.7 (2021-XX-XX)

* n/a

# 2.14.6 (2021-05-16)

* Revert "Throw a proper exception when a template name is an absolute path (as it has never been supported)"

Expand Down Expand Up @@ -443,7 +447,11 @@
* improved the performance of the filesystem loader
* removed features that were deprecated in 1.x

# 1.44.4 (2021-XX-XX)
# 1.44.5 (2021-XX-XX)

* n/a

# 1.44.4 (2021-05-16)

* Revert "Throw a proper exception when a template name is an absolute path (as it has never been supported)"

Expand Down
File renamed without changes.

0 comments on commit 4e479f1

Please sign in to comment.