[icinga-checkins] icinga.org: icinga-web/jmosshammer/default: Merge branch 'master' of ssh:// git.icinga.org/icinga-web into jmosshammer/default

git at icinga.org git at icinga.org
Wed Jul 13 07:55:56 CEST 2011


Module: icinga-web
Branch: jmosshammer/default
Commit: 180e7840d34f01095041096b9ec441aa10889cfd
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=180e7840d34f01095041096b9ec441aa10889cfd

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Jul 13 07:55:38 2011 +0200

Merge branch 'master' of ssh://git.icinga.org/icinga-web into jmosshammer/default

Conflicts:
	app/modules/AppKit/actions/Admin/Users/EditAction.class.php
	app/modules/AppKit/actions/Login/SilentAuthAction.class.php
	app/modules/AppKit/models/Auth/DispatchModel.class.php
	app/modules/AppKit/models/UserAdminModel.class.php
	app/modules/Cronks/models/Provider/CronksDataModel.class.php

---







More information about the icinga-checkins mailing list