Vitor Mattos ab630f2cab Fix conflict ... Signed-off-by: Vitor Mattos <vitor@php.rio>		2022-01-21 08:39:41 -03:00
..
composer	Fix conflict	2022-01-21 08:39:41 -03:00
l10n
private	Fix check after change from string to mb_string	2022-01-21 08:39:41 -03:00
public	Remove order from groupConcat as it is not working everywhere	2022-01-21 08:39:39 -03:00
autoloader.php
base.php	Load core before the update script	2022-01-18 14:55:13 +01:00
versioncheck.php