Skip to content

Commit 4ac6a3c

Browse files
Quetzacoalt91Quetzacoalt91
authored
Merge pull request #49 from apacios/feature/merging_gadwords
Make compatible 1.6
2 parents c5a17d2 + 90c93c6 commit 4ac6a3c

25 files changed

Lines changed: 85 additions & 133 deletions

‎Readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Google Tag Assistant will report "No HTTP Response detected" error in Prestashop
1414

1515
PrestaShop modules are open-source extensions to the PrestaShop e-commerce solution. Everyone is welcome and even encouraged to contribute with their own improvements.
1616

17-
Google Analytics is compatible with all versions of PrestaShop 1.7
17+
Google Analytics is compatible with all versions of PrestaShop 1.7 and 1.6
1818

1919
### Requirements
2020

‎controllers/admin/AdminGanalyticsAjax.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* 2007-2015 PrestaShop
3+
* 2007-2020 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2020 PrestaShop SA
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

‎controllers/admin/index.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* 2007-2015 PrestaShop
3+
* 2007-2020 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2020 PrestaShop SA
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

‎controllers/front/ajax.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* 2007-2015 PrestaShop
3+
* 2007-2020 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2020 PrestaShop SA
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

‎controllers/front/index.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* 2007-2015 PrestaShop
3+
* 2007-2020 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2020 PrestaShop SA
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

‎controllers/index.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* 2007-2015 PrestaShop
3+
* 2007-2020 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2020 PrestaShop SA
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

‎fr.php‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎index.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
* 2007-2015 PrestaShop
3+
* 2007-2020 PrestaShop
44
*
55
* NOTICE OF LICENSE
66
*
@@ -19,7 +19,7 @@
1919
* needs please refer to http://www.prestashop.com for more information.
2020
*
2121
* @author PrestaShop SA <contact@prestashop.com>
22-
* @copyright 2007-2015 PrestaShop SA
22+
* @copyright 2007-2020 PrestaShop SA
2323
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2424
* International Registered Trademark & Property of PrestaShop SA
2525
*/

‎logo.gif‎

-550 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)