Ingo Schommer b0d3f7f3a2 Merge remote-tracking branch 'origin/3.1' ... Conflicts: api/RSSFeed.php dev/SapphireTest.php tests/control/RequestHandlingTest.php		2013-03-26 10:46:41 +01:00
..
config.yml	API Marked statics private, use Config API instead (#8317)	2013-03-24 17:20:53 +01:00
encryptors.yml	MINOR: Rename & tweak some existing config files to better reflect meaning of various names	2012-05-19 14:37:32 +12:00
html.yml	API Make HTMLValue replace-able via DI	2013-03-14 12:49:02 +13:00
mimetypes.yml	MINOR: Rename & tweak some existing config files to better reflect meaning of various names	2012-05-19 14:37:32 +12:00
Oembed.yml	ENHANCEMENT Oembed.enabled config property	2012-06-08 18:40:34 +02:00
routes.yml	API Removed auto-routing of controller name	2013-02-18 14:29:47 +01:00
uploadfield.yml	NEW: Added replaceExistingFile setting for UploadField.	2013-01-11 09:29:06 +01:00