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

Merge branch 'support/3.0' into develop

Browse Source 
# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
This commit is contained in:
Eric Espie
2022-12-07 13:52:42 +01:00
parent 0579f1b1dc f66692d5cf
commit e4d8489292
5 changed files with 74 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/licenses/community-licenses.xml
View File

@@ -1674,7 +1674,7 @@ to represent the company, product, or service to which they refer.**
</license>
<license>
<product scope="datamodels">apereo/phpcas</product>
<author>Joachim Fritschi - Adam Franco</author>
<author>Joachim Fritschi - Adam Franco - Henry Pan</author>
<license_type>Apache-2.0</license_type>
<text><![CDATA[
Apache License