[icinga-checkins] icinga.org: icinga-web/mhein/testing: Merge branch 'elippmann/ config_handlers' of git.icinga.org:icinga-web into mhein/testing

git at icinga.org git at icinga.org
Tue Aug 2 10:58:52 CEST 2011


Module: icinga-web
Branch: mhein/testing
Commit: 22e32f1721f765fa22fa9f2918f0f41c39a883b5
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=22e32f1721f765fa22fa9f2918f0f41c39a883b5

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Aug  2 10:58:15 2011 +0200

Merge branch 'elippmann/config_handlers' of git.icinga.org:icinga-web into mhein/testing

Conflicts:
	app/config/config_handlers.xml
	app/config/routing.xml
	app/modules/AppKit/actions/Widgets/AddHeaderDataAction.class.php
	app/modules/AppKit/actions/Widgets/SquishLoaderAction.class.php
	app/modules/AppKit/config/autoload.xml
	app/modules/AppKit/config/module.xml
	app/modules/AppKit/lib/html/AppKitBulkLoader.class.php
	app/modules/AppKit/lib/model/AppKitBaseModel.class.php
	app/modules/AppKit/models/HeaderDataModel.class.php
	app/modules/AppKit/models/SquishFileContainerModel.class.php
	app/modules/AppKit/views/Widgets/AddHeaderDataSuccessView.class.php
	app/modules/AppKit/views/Widgets/SquishLoaderSuccessView.class.php
	app/modules/Cronks/config/module.xml
	app/modules/Reporting/config/module.xml

---







More information about the icinga-checkins mailing list