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
..
css	Added Bootstrap Alpha.2	2016-02-23 11:11:24 +13:00
images	ENHANCEMENT:added logo to header on ss3 install page - plus compass regenerated icon sprites.	2012-04-05 11:18:11 +12:00
scss	Added Bootstrap Alpha.2	2016-02-23 11:11:24 +13:00
config-form.html	Merge remote-tracking branch 'origin/3'	2016-02-25 14:51:59 +13:00
DatabaseAdapterRegistry.php	Fixing function that should be declared as static.	2014-07-11 15:23:44 +12:00
DatabaseConfigurationHelper.php	Remove all redundant whitespace	2014-08-19 09:17:15 +12:00
install.js	MINORE: Remove training whitespace.	2016-01-07 10:15:54 +13:00
install.php	Increase minimum required PHP version to 5.5	2015-10-22 23:11:16 +13:00
install.php5	Merge remote-tracking branch 'origin/3'	2016-01-20 13:16:27 +13:00
MySQLDatabaseConfigurationHelper.php	API New Database abstraction layer. Ticket #7429	2014-07-09 18:04:05 +12:00
php5-required.html	Increase minimum required PHP version to 5.5	2015-10-22 23:11:16 +13:00