Ingo Schommer ac45e5b9c0 Merge branch 'integration' ... Conflicts: admin/css/ie8.css admin/css/screen.css admin/scss/_style.scss dev/install/config-form.html dev/install/install.css dev/install/php5-required.html		2012-04-11 16:31:12 +02:00
..
_old	BUGFIX show scroll bar on menu and side panels in adminstration section rather than hiding	2011-10-29 15:47:07 +13:00
ie7.css	BUGFIX:removed reference to compass generated sprite and added direct reference to the png file.	2012-04-10 14:16:07 +02:00
ie8.css	MINOR:Trac #7116 - added a set width to dropdowns in filter side panel for IE8	2012-04-11 11:43:53 +12:00
screen.css	Merge branch 'integration'	2012-04-11 16:31:12 +02:00