Johannes Meyer bb7972aa39 Merge branch 'master' into bugfix/rebuild-form-builder-5525 ... Conflicts: application/controllers/AuthenticationController.php application/controllers/ConfigController.php application/forms/Authentication/LoginForm.php application/forms/Preference/GeneralForm.php modules/monitoring/application/controllers/ChartController.php		2014-08-20 13:13:50 +02:00
..
application	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-08-20 13:13:50 +02:00
bin/action	Remove license headers from all files	2014-07-15 13:43:52 +02:00
doc	Fix testing documentation	2014-04-10 15:54:50 +02:00
library/Monitoring	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-08-20 13:13:50 +02:00
public	Contacts: replace foreach loop with hardcoded HTML and move the styles to a CSS file	2014-07-17 17:33:45 +02:00
test/php	monitoring/Perfdata: ignore invalid min/max	2014-07-31 16:52:34 +02:00
configuration.php	Remove license headers from all files	2014-07-15 13:43:52 +02: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