José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados' ... # Conflicts: # pandora_console/general/header.php # pandora_console/general/sap_view.php		2020-12-23 06:48:22 +01:00
..
Items	fix bugs vc serialez module string donuts and bars charts	2020-11-24 10:59:42 +01:00
Container.php	dashboards	2020-03-26 12:29:38 +01:00
Item.php	dashboards	2020-03-26 12:29:38 +01:00
View.php	Updated copyrights	2020-11-27 13:52:35 +01:00