Skip to content

Commit

Permalink
Merge branch '3.2.x' into prep-release-2.1.6
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
  • Loading branch information
Skouat committed Jun 12, 2022
2 parents 1254ca5 + 979a31d commit 74ccff5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# PayPal Donation for phpBB - 3.2.x Develop Branch
# PayPal Donation for phpBB - 3.2.x Branch
This extension add a PayPal Donation page on your site.

[![Build Status](https://travis-ci.org/Skouat/ext_paypal_donation.svg?branch=develop-3.2.x)](https://travis-ci.org/Skouat/ext_paypal_donation) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Skouat/ext_paypal_donation/badges/quality-score.png?b=develop-3.2.x)](https://scrutinizer-ci.com/g/Skouat/ext_paypal_donation/?branch=develop-3.2.x)
[![Build Status](https://travis-ci.org/Skouat/ext_paypal_donation.svg?branch=3.2.x)](https://travis-ci.org/Skouat/ext_paypal_donation) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Skouat/ext_paypal_donation/badges/quality-score.png?b=3.2.x)](https://scrutinizer-ci.com/g/Skouat/ext_paypal_donation/?branch=3.2.x)

## Features
* PayPal IPN (Instant Payment Notification)
Expand Down
2 changes: 1 addition & 1 deletion travis/prepare-epv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ if [[ "$EPV" == "1" && "$NOTESTS" == "1" ]]
then
cd phpBB
composer remove sami/sami --update-with-dependencies --dev --no-interaction
composer require phpbb/epv:dev-master --dev --no-interaction --ignore-platform-reqs
composer require phpbb/epv:0.0.11 --dev --no-interaction --ignore-platform-reqs
cd ../
fi

0 comments on commit 74ccff5

Please sign in to comment.