Skip to content

Commit

Permalink
Merge pull request PrestaShop#21928 from atomiix/release-1.7.6.9
Browse files Browse the repository at this point in the history
  • Loading branch information
Pablo Borowicz authored Nov 16, 2020
2 parents 709d9af + 6a7c89a commit 1ae609d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ matrix:
env: EXTRA_DEPS=phpHigh PRESTASHOP_TEST_TYPE=unit

before_install:
- composer self-update --1
- /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_10.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :10 -ac -screen 0 1600x1200x16
# Avoid Composer authentication issues
- if [[ "$TRAVIS_REPO_SLUG" = PrestaShop/PrestaShop ]]; then cp travis-scripts/.composer-auth.json ~/.composer/auth.json; fi;
Expand Down
4 changes: 2 additions & 2 deletions app/AppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@

class AppKernel extends Kernel
{
const VERSION = '1.7.6.8';
const VERSION = '1.7.6.9';
const MAJOR_VERSION_STRING = '1.7';
const MAJOR_VERSION = 17;
const MINOR_VERSION = 6;
const RELEASE_VERSION = 8;
const RELEASE_VERSION = 9;

/**
* @{inheritdoc}
Expand Down
7 changes: 7 additions & 0 deletions docs/CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ International Registered Trademark & Property of PrestaShop SA

Release Notes for PrestaShop 1.7
--------------------------------
####################################
# v1.7.6.9 - (2020-11-16)
####################################
- Core:
- Bug fix:
- #GHSA-frf2-c9q3-qg9m: Improper Access Control with submitReorder function (by @PierreRambaud)

####################################
# v1.7.6.8 - (2020-09-24)
####################################
Expand Down
2 changes: 1 addition & 1 deletion install-dev/install_version.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* International Registered Trademark & Property of PrestaShop SA
*/

define('_PS_INSTALL_VERSION_', '1.7.6.8');
define('_PS_INSTALL_VERSION_', '1.7.6.9');

define('_PS_INSTALL_MINIMUM_PHP_VERSION_ID_', 50600);
define('_PS_INSTALL_MINIMUM_PHP_VERSION_', '5.6');

0 comments on commit 1ae609d

Please sign in to comment.