[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
Tue Aug 9 14:38:26 CEST 2011


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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Tue Aug  9 14:37:57 2011 +0200

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

Conflicts:
	app/modules/AppKit/config/module.xml
	app/modules/AppKit/templates/Ext/HeaderSuccess.php

---







More information about the icinga-checkins mailing list