Simon Welsh fbce9fd7cd Merge branch '3.1' ...

Conflicts:
	.travis.yml
	docs/en/misc/contributing/code.md
	javascript/HtmlEditorField.js

2013-07-05 10:22:58 +12: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 branch '3.1'

2013-07-05 10:22:58 +12:00