Ingo Schommer 25b6175e67 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	.travis.yml
	forms/FormField.php

2013-10-20 13:52:56 +02:00

..

editor.css

Render broken link in HtmlEditorField

2013-08-09 11:51:18 +02:00

ie7.css

Better default icon for ModelAdmin

2013-04-09 13:43:32 +02:00

ie8.css

Fix for ie8 styles for preview switch and modes

2012-12-17 23:11:05 +01:00

screen.css

Merge remote-tracking branch 'origin/3.1'

2013-10-20 13:52:56 +02:00