Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/4.0-dev' into j4/cleanup/plg_s…
Browse files Browse the repository at this point in the history
…ystem_cache
  • Loading branch information
SharkyKZ committed Nov 27, 2019
2 parents c434273 + c849ba8 commit 8cf9fa4
Show file tree
Hide file tree
Showing 664 changed files with 1,366 additions and 2,561 deletions.
3 changes: 1 addition & 2 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ steps:
- name: system-tests-mysql8
depends_on: [ system-tests-mysql ]
image: joomlaprojects/docker-images:systemtests
failure: ignore
commands:
- bash tests/Codeception/drone-system-run.sh "$(pwd)" mysql8

Expand Down Expand Up @@ -298,6 +297,6 @@ services:

---
kind: signature
hmac: 1f8eaa619ff21c79d04d71f2323bb2600024fb54ae56e57a9238d8da0e63255c
hmac: 9269cc571ec30d3d18ba3bb5f7dc132c36608b54ec777ae6d9c6dde224255fc8

...
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Build Status
| ------------- | ------------- |
| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=4.0-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/4.0-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) |

What is this?
Overview
---------------------
* This is the source of Joomla! 4.x.
* Joomla's [Official website](https://www.joomla.org).
Expand Down
4 changes: 3 additions & 1 deletion README.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
1- What is this?
Joomla! CMS™

1- Overview
* This is a Joomla! 4.x installation/upgrade package.
* Joomla! Official site: https://www.joomla.org
* Joomla! 4.0 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_4.0_version_history
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 8cf9fa4

Please sign in to comment.