Andreas Fischer 76f3d08383 Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping		2011-09-27 20:58:17 +02:00
..
images	removed executable props [Bug #6464]	2008-06-04 15:37:06 +00:00
style	Merge branch 'develop-olympus' into develop	2011-09-27 20:58:17 +02:00
index.php	[feature/remove-db-styles] Removed database storage of style components.	2011-09-20 21:06:51 +01:00
swatch.php	[ticket/9556] Drop php closing tags, add trailing newline	2010-11-11 19:10:55 +01:00