tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
pandorafms/pandora_console/tests/Functional/Models/VisualConsole
History
Daniel Maya de750bb59f Merge branch 'visual-console-refactor' into 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual' 
# Conflicts:
#   pandora_console/include/rest-api/models/VisualConsole/Items/ColorCloud.php
#   pandora_console/include/rest-api/models/VisualConsole/Items/Label.php
#   pandora_console/tests/Functional/Models/VisualConsole/Items/ColorCloudTest.php
#   pandora_console/tests/Functional/Models/VisualConsole/Items/LabelTest.php

Former-commit-id: 4ef35ceb24d2cde4b3d18f92ea14ea617fcba2cd
 		2019-04-04 10:10:26 +02:00
..
Items Merge branch 'visual-console-refactor' into 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual' 2019-04-04 10:10:26 +02:00
ContainerTest.php Visual Console Refactor: the model's JSON representation is now sorted alphabetically 2019-03-26 11:45:50 +01:00
ItemTest.php Visual Console Refactor: the model's JSON representation is now sorted alphabetically 2019-03-26 11:45:50 +01:00