Harald Leithner 333d54ed95 Merge branch 'staging' into 3.10-dev ... # Conflicts: # administrator/language/en-GB/en-GB.xml # administrator/language/en-GB/install.xml # administrator/manifests/files/joomla.xml # administrator/manifests/packages/pkg_en-GB.xml # installation/language/en-GB/en-GB.xml # installation/language/fa-IR/fa-IR.ini # installation/language/fa-IR/fa-IR.xml # language/en-GB/en-GB.xml # language/en-GB/install.xml # libraries/src/Version.php		2021-01-12 16:13:39 +01:00
..
application	Converted copyright statement to standard format (#29689)	2020-08-12 17:57:18 +02:00
cache	Create a cache directory for the install app (#10699)	2016-06-01 12:51:18 +02:00
controller	Converted copyright statement to standard format (#29689)	2020-08-12 17:57:18 +02:00
form	Converted copyright statement to standard format (#29689)	2020-08-12 17:57:18 +02:00
helper	Converted copyright statement to standard format (#29689)	2020-08-12 17:57:18 +02:00
html	Converted copyright statement to standard format (#29689)	2020-08-12 17:57:18 +02:00
language	Merge branch 'staging' into 3.10-dev	2021-01-12 16:13:39 +01:00
model	Merge branch 'staging' of github.com:joomla/joomla-cms into 3.10-dev	2020-11-01 23:10:58 +01:00
response	Converted copyright statement to standard format (#29689)	2020-08-12 17:57:18 +02:00
sql	[3.10] Backport database changes from PR #30192 to fix broken updates from 3.10 to 4 (#30333)	2020-08-12 08:38:20 +02:00
template	Converted copyright statement to standard format (#29689)	2020-08-12 17:57:18 +02:00
view	Converted copyright statement to standard format (#29689)	2020-08-12 17:57:18 +02:00
configuration.php-dist	Converted copyright statement to standard format (#29689)	2020-08-12 17:57:18 +02:00
COPYRIGHT	Converted copyright statement to standard format (#29689)	2020-08-12 17:57:18 +02:00
CREDITS	Converted copyright statement to standard format (#29689)	2020-08-12 17:57:18 +02:00
favicon.ico	Replace Joomla logo graphics based on draft brand manual	2015-03-15 14:09:07 -04:00
index.php	Converted copyright statement to standard format (#29689)	2020-08-12 17:57:18 +02:00
INSTALL	Converted copyright statement to standard format (#29689)	2020-08-12 17:57:18 +02:00
LICENSES	Converted copyright statement to standard format (#29689)	2020-08-12 17:57:18 +02:00
localise.xml	remove Help Server unofficial property (#24927)	2019-06-05 17:07:11 +02:00