tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
dff65867cc
silverstripe-framework/api
History
Damian Mooyman dff65867cc Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php
2015-02-20 10:17:19 +13:00
..
DataFormatter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
FormEncodedDataFormatter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
JSONDataFormatter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
RestfulService.php Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 10:17:19 +13:00
RSSFeed.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
XMLDataFormatter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00