[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
Sun Jun 26 11:22:17 CEST 2011


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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Sun Jun 26 11:20:52 2011 +0200

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

Conflicts:
	app/modules/Cronks/config/cronks.xml
	app/modules/Cronks/models/System/StaticContentModel.class.php
	app/modules/Cronks/models/System/StaticContentTemplateModel.class.php
	app/modules/Cronks/views/System/StaticContentSuccessView.class.php

---







More information about the icinga-checkins mailing list