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
pdf	Remove license headers from all files	2014-07-15 13:43:52 +02:00
vendor	Rename tipsy stylesheet file type to css and add license	2014-09-03 17:01:07 +02:00