composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	core/log.class.inc.php
This commit is contained in:
Pierre Goiffon
2022-11-24 17:28:39 +01:00
parent ebf3f48584 34f03715b6
commit 4ec3f22173
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/log.class.inc.php
View File

@@ -551,6 +551,9 @@ class LogChannels
*/
public const NOTIFICATIONS = 'notifications';
/**
* @since 3.0.0
*/
public const CLI = 'CLI';
/**
@@ -560,11 +563,14 @@ class LogChannels
*/
public const CMDB_SOURCE = 'cmdbsource';
public const CONSOLE = 'console';
/**
* @since 3.0.0
*/
public const CONSOLE = 'console';
public const CORE = 'core';
public const CORE = 'core';
public const DEADLOCK = 'DeadLock';
public const DEADLOCK = 'DeadLock';
public const INLINE_IMAGE = 'InlineImage';