Eric Lippmann 796cbffbd7 Merge branch 'master' into bugfix/time-formatting-6778 ...

Conflicts:
	modules/monitoring/application/views/scripts/show/components/notifications.phtml

2015-04-15 15:43:39 +02:00

..

doc

Inherit from Icinga\Web\Controller rather than from Icinga\Web\Controller\ModuleActionController

2015-04-08 15:13:59 +02:00

monitoring

Merge branch 'master' into bugfix/time-formatting-6778

2015-04-15 15:43:39 +02:00

setup

Wizard: Ensure that privileges are checked only once

2015-04-15 09:26:39 +02:00

test

Fix some spelling errors in comments and messages

2015-03-08 15:32:22 +01:00

translation

Fix some spelling errors in comments and messages

2015-03-08 15:32:22 +01:00