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

..

application

Merge branch 'master' into feature/redesign-7144

2014-11-12 17:21:54 +01:00

doc

Fix testing documentation

2014-04-10 15:54:50 +02:00

library/Monitoring

Merge branch 'master' into feature/setup-wizard-7163

2014-11-12 10:08:28 +01:00

public

Fix Plugin Output

2014-11-12 16:40:34 +01:00

test/php

Bug7043Test: Fix declaration error

2014-11-06 12:14:35 +01:00

configuration.php

Merge branch 'master' into feature/setup-wizard-7163

2014-11-12 17:05:13 +01:00

module.info

monitoring/module.info: provide sample metadata

2014-05-26 14:35:59 +00:00

run.php

Remove license headers from all files

2014-07-15 13:43:52 +02:00