Matthias Jentsch 51d14af154 Merge branch 'master' into feature/navigation-unhandled-badges-7114 ... Conflicts: library/Icinga/Web/Menu.php		2014-09-05 18:14:29 +02:00
..
Icinga	Merge branch 'master' into feature/navigation-unhandled-badges-7114	2014-09-05 18:14:29 +02:00
IcingaVendor	vendor/lessphp: we don't need travis.yml right now	2014-06-05 00:15:31 +00:00