Ingo Schommer f3c0669fec Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	_config/uploadfield.yml
	css/UploadField.css
	forms/UploadField.php
	scss/UploadField.scss
	templates/UploadField.ss
	tests/forms/uploadfield/UploadFieldTest.php
2013-01-11 10:02:39 +01:00
..
2012-12-04 20:00:09 +13:00
2012-10-02 00:02:44 +02:00
2013-01-09 12:46:09 +10:00
2012-06-21 21:11:48 +02:00