mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-12 23:14:18 +01:00
Merge branch 'support/3.2' into develop
This commit is contained in:
4
node_modules/@cityssm/fa5-power-transforms-css/LICENSE
generated
vendored
4
node_modules/@cityssm/fa5-power-transforms-css/LICENSE
generated
vendored
@@ -1,6 +1,10 @@
|
||||
<<<<<<<< HEAD:node_modules/@cityssm/fa5-power-transforms-css/LICENSE
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2020 The Corporation of the City of Sault Ste. Marie
|
||||
========
|
||||
Copyright (c) 2010-present Fabien Potencier
|
||||
>>>>>>>> support/3.2:lib/symfony/mime/LICENSE
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
Reference in New Issue
Block a user