Eric e08369122d Merge remote-tracking branch 'origin/support/2.5' into release/2.6 ...

# Conflicts:
#	core/config.class.inc.php
#	css/css-variables.scss
#	css/light-grey.css

2018-11-29 09:10:34 +01:00

..

application

Merge remote-tracking branch 'origin/support/2.5' into release/2.6

2018-11-29 09:10:34 +01:00

core

N°562 Notifications: Add support for placeholders in HTML hyperlinks (regular href, mailto, ...)

2018-11-06 17:35:17 +01:00

itop-tickets

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

setup

…

attributeset_widget_poc.html

…

benchmark.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

composer.json

…

composer.lock

…

config-test-farm.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

display_cache_content.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

GroupByAndFunctions.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

ItopDataTestCase.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

ItopTestCase.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

phpunit.xml.dist

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

replay_query_log.php

…

test.class.inc.php

…

test.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00

testlist.inc.php

…

unittestautoload.php

Convert all files from CrLf to Lf (preparing merge to develop)

2018-10-18 14:20:40 +02:00