Bernd Erk ac8cc0613c Merge branch 'master' into feature/redesign-7144 ... Conflicts: application/views/scripts/authentication/login.phtml public/css/icinga/login.less		2014-11-12 17:21:54 +01:00
..
CheckPerformance.php	Remove license headers from all files	2014-07-15 13:43:52 +02:00
ContactFlags.php	Remove license headers from all files	2014-07-15 13:43:52 +02:00
Customvar.php	Customvar view helper: show structured data	2014-11-06 16:10:52 +01:00
MonitoringFlags.php	AbstractObject: Rename to MonitoredObject	2014-09-04 14:00:48 +02:00
MonitoringState.php	helpers/MonitoringState: translate 'since'	2014-11-12 09:13:49 +01:00
Perfdata.php	Adjust CSS for inlinePies to be centered on the current line	2014-08-28 18:27:30 +02:00
PluginOutput.php	Fixed Plugin output and box-border	2014-11-06 15:49:26 +01:00
ResolveMacros.php	AbstractObject: Rename to MonitoredObject	2014-09-04 14:00:48 +02:00
RuntimeVariables.php	Remove license headers from all files	2014-07-15 13:43:52 +02:00
SelectionToolbar.php	Remove license headers from all files	2014-07-15 13:43:52 +02:00
_RenderServicePerfdata.php	Remove license headers from all files	2014-07-15 13:43:52 +02:00