upstream/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2026-06-09 16:40:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
icingaweb2/application
History
Marius Hein 10cfecf2ec Merge remote-tracking branch 'origin/master' into feature/add-to-dashboard-4537 
Conflicts:
	application/controllers/DashboardController.php
	library/Icinga/Web/Form.php
	library/Icinga/Web/Widget/Dashboard.php
2014-11-18 16:36:42 +01:00
..
clicommands icingacli web serve: Fix "PHP Notice: Use of undefined constant ICINGA_LIBDIR" 2014-11-14 16:02:17 +01:00
controllers Merge remote-tracking branch 'origin/master' into feature/add-to-dashboard-4537 2014-11-18 16:36:42 +01:00
fonts/fontanello-ifont Enable icon font 2014-11-13 20:08:58 +01:00
forms Merge remote-tracking branch 'origin/master' into feature/add-to-dashboard-4537 2014-11-18 16:36:42 +01:00
layouts/scripts PHP: avoid short tags <? 2014-10-23 10:44:54 +02:00
locale Fix spelling issue in german translation catalog 2014-09-02 16:19:45 +02:00
views Merge remote-tracking branch 'origin/master' into feature/add-to-dashboard-4537 2014-11-18 16:36:42 +01:00