Thomas Gelf 3462f0ee9a Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 ... Conflicts: modules/monitoring/application/views/scripts/host/history.phtml modules/monitoring/application/views/scripts/list/services.phtml		2015-06-18 11:26:51 +02:00
..
components	customvars.phtml: no header if no vars	2015-06-16 01:15:32 +02:00
contact.phtml	show/contact: Ensure dashboard compliance	2015-04-17 16:10:49 +02:00