Johannes Meyer c288a68ed5 Merge branch 'master' into bugfix/drop-zend-config-7147 ... Conflicts: application/forms/LdapDiscoveryForm.php		2014-11-18 13:21:18 +01:00
..
doc	doc/styles: add tabs, more to come	2014-11-17 10:39:25 +01:00
monitoring	Merge branch 'master' into bugfix/drop-zend-config-7147	2014-11-18 13:21:18 +01:00
setup	Merge branch 'master' into bugfix/drop-zend-config-7147	2014-11-18 13:21:18 +01:00
test	test/module.info: basic metadata file	2014-11-14 08:54:33 +01:00
translation	translation/module.info: module meta data	2014-11-14 08:48:49 +01:00