pandorafms/pandora_console/godmode/events
mdtrooper 73e0a74a1a Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting.php
2015-05-06 17:02:40 +02:00
..
custom_events.php Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs). 2015-04-10 00:58:24 +02:00
event_edit_filter.php Merge branch 'develop' into feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES 2015-05-06 17:02:40 +02:00
event_filter.php Change titles. 2015-04-15 13:14:03 +02:00
event_responses.editor.php Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs). 2015-04-10 00:58:24 +02:00
event_responses.list.php Merge from the pandora_5.1 branch to feature/#1978-REESCRITURA_DEL_MOTOR_DE_INFORMES branch the new report items (availability and time overlaped in the simple graphs). 2015-04-10 00:58:24 +02:00
event_responses.php
events.php Change titles. 2015-04-15 13:14:03 +02:00