Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Prestarocket committed Jun 17, 2020
2 parents a5d32b0 + 754ce0d commit d7194d2
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
16 changes: 14 additions & 2 deletions LICENCE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
Copyright (c) 2007-2018 PrestaShop.
Copyright (c) 2011-2020 Prestarocket (Just Web S.A.R.L.)

This theme is licensed under AFL-3.0.
By downloading or installing or using the Classic Rocket (the "Theme"), you consent to the terms and conditions of this license on behalf of yourself and the company on whose behalf you will use the Theme provided under this license.


The use of the Theme is permitted provided that the following conditions are met:

You can:
- Customize the Theme
- Use the Theme for personal and client projects
You cannot:
- Use in derivative PrestaShop themes that anyone can download for sale or for free.
- Use any of the components included in the Theme in a project that is not built upon the Theme

Classic Rocket Theme (THE "SOFTWARE") ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2 changes: 1 addition & 1 deletion config/theme.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: classic-rocket
display_name: Classic Rocket
version: 3.0.1
version: 3.0.4
author:
name: "Prestarocket"
email: "contact@prestarocket.com"
Expand Down
4 changes: 2 additions & 2 deletions templates/_partials/footer.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
</div>
<p class="text-center mb-0 pb-3">
{block name='copyright_link'}
<a class="_blank" href="https://www.prestashop.com" target="_blank" rel="nofollow">
{l s='%copyright% %year% - Ecommerce software by %prestashop%' sprintf=['%prestashop%' => 'PrestaShop', '%year%' => 'Y'|date, '%copyright%' => '©'] d='Shop.Theme.Global'}
<a class="_blank" href="https://prestarocket.com/" target="_blank" rel="nofollow">
{l s='%copyright% %year% - Theme by %prestashop%' sprintf=['%prestashop%' => 'Prestarocket', '%year%' => 'Y'|date, '%copyright%' => '©'] d='Shop.Theme.Global'}
</a>
{/block}
</p>
Expand Down

0 comments on commit d7194d2

Please sign in to comment.