Merge remote-tracking branch 'origin/support/2.7.0' into support/2.7

# Conflicts:
#	datamodels/2.x/itop-attachments/renderers.itop-attachments.php
This commit is contained in:
Pierre Goiffon
2020-04-29 09:00:10 +02:00
7 changed files with 63 additions and 47 deletions

View File

@@ -17,7 +17,7 @@
*/
// Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
$version: "v2.7.0-1";
$version: "v2.7.0-2";
$approot-relative: "../../../../../" !default; // relative to env-***/branding/themes/***/main.css
// Base colors