silverstripe-framework/docs/en/misc
Mateusz Uzdowski 8bf3853887 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php
2014-08-14 09:08:26 +12:00
..
contributing Merge remote-tracking branch 'origin/3.1' 2014-08-14 09:08:26 +12:00
coding-conventions.md API New Database abstraction layer. Ticket #7429 2014-07-09 18:04:05 +12:00
index.md Update module development, remove outdated release steps 2013-06-15 12:06:25 +12:00
release-process.md QA pointers in docs 2014-03-16 11:41:21 +13:00
ss-markdown.md Fixed sapphiredocs references 2012-11-06 11:01:48 +01:00
translation-process.md Updated translation docs to include JS process 2013-12-19 18:00:54 +01:00