silverstripe-framework/_config
Ingo Schommer 0d7e9a9692 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	_config/routes.yml
	docs/en/topics/datamodel.md
	forms/DropdownField.php
2014-02-04 08:19:04 +13: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
i18n.yml NEW Allow specifying priority for translations 2013-05-06 12:51:46 +12: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 FIX oembed to avoid mixed media issues 2013-10-17 17:06:40 +13:00
requestprocessors.yml FIX: Move stage choosing into a pre-request filter. 2013-10-23 18:29:13 +13:00
routes.yml Merge remote-tracking branch 'origin/3.1' 2014-02-04 08:19:04 +13:00
uploadfield.yml API UploadField functions on new records 2013-05-27 15:22:59 +12:00