[icinga-checkins] icinga.org: icinga-web/mhein/extlayout: Merge branch 'mhein/extlayout' of git at git.icinga.org:icinga-web into jmosshammer/principal

git at icinga.org git at icinga.org
Tue May 11 19:18:10 CEST 2010


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

Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Thu Apr 29 13:02:32 2010 +0200

Merge branch 'mhein/extlayout' of git at git.icinga.org:icinga-web into jmosshammer/principal

Conflicts:
	app/config/routing.xml
	app/config/translation.xml
	app/modules/AppKit/config/autoload.xml

---







More information about the icinga-checkins mailing list