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

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

Browse Source 
# Conflicts:
#	core/kpi.class.inc.php
#	datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml
This commit is contained in:
jf-cbd
2025-06-16 15:03:36 +02:00
parent 916467ea61 d1e6334629
commit fb81e54ed9
21 changed files with 109 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node_modules/ckeditor5-itop-build/build/ckeditor.js generated vendored
View File

File diff suppressed because one or more lines are too long

2
node_modules/ckeditor5-itop-build/build/ckeditor.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

2
node_modules/ckeditor5-itop-build/build/plugins/detect-change/detect-change.plugin.d.ts generated vendored
View File

@@ -1,5 +1,4 @@
import { Plugin, type Editor } from 'ckeditor5/src/core.js';
import InsertCarriageReturnAfterBlock from "../insert-carriage-return-after-block/insert-carriage-return-after-block.plugin";
/**
* DetectChanges Plugin.
*
@@ -9,5 +8,4 @@ export default class DetectChanges extends Plugin {
constructor(editor: Editor);
init(): void;
static get pluginName(): string;
static get requires(): (typeof InsertCarriageReturnAfterBlock)[];
}