Damian Mooyman 3b0a9f4ba2 Merge remote-tracking branch 'origin/3' ... # Conflicts: # admin/javascript/LeftAndMain.Menu.js # control/HTTPRequest.php # css/GridField.css # css/GridField.css.map # docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md # docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md # docs/en/02_Developer_Guides/06_Testing/index.md # docs/en/02_Developer_Guides/14_Files/01_File_Management.md # docs/en/02_Developer_Guides/14_Files/02_Images.md # filesystem/Upload.php # javascript/HtmlEditorField.js # model/Image.php # model/connect/MySQLDatabase.php # model/fieldtypes/Enum.php # model/versioning/Versioned.php # scss/GridField.scss		2016-02-25 14:51:59 +13:00
..
_elementMixins.scss	Replace Compass with gulp-sass	2016-02-16 18:35:57 +13:00
AssetUploadField.scss	Added Bootstrap Alpha.2	2016-02-23 11:11:24 +13:00
CheckboxSetField.scss	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
ConfirmedPasswordField.scss	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
DatetimeField.scss	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
debug.scss	Replace Compass with gulp-sass	2016-02-16 18:35:57 +13:00
Form.scss	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
GridField_print.scss	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
GridField.scss	Merge remote-tracking branch 'origin/3'	2016-02-25 14:51:59 +13:00
GridFieldPaginator.scss	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
Security_login.scss	MINOR Using SCSS/Compass for sapphire/css	2012-01-08 19:14:32 +01:00
SelectionGroup.scss	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
SubmittedFormReportField.scss	MINOR Using SCSS/Compass for sapphire/css	2012-01-08 19:14:32 +01:00
TreeDropdownField.scss	Added Bootstrap Alpha.2	2016-02-23 11:11:24 +13:00
UnitTesting.scss	MINOR Using SCSS/Compass for sapphire/css	2012-01-08 19:14:32 +01:00
UploadField.scss	Added Bootstrap Alpha.2	2016-02-23 11:11:24 +13:00