silverstripe-framework/docs/en/05_Contributing
Damian Mooyman 09210efbc0 Merge remote-tracking branch 'origin/3'
Conflicts:
	composer.json
	control/Session.php
	docs/en/05_Contributing/01_Code.md
	docs/en/05_Contributing/02_Release_Process.md
	forms/FormField.php
	model/DataQuery.php
	model/Image.php
	model/queries/SQLConditionalExpression.php
	view/SSViewer.php
	view/ViewableData.php
2015-07-31 15:49:35 +12:00
..
00_Issues_and_Bugs.md Update 00_Issues_and_Bugs.md 2015-06-18 20:04:07 +12:00
01_Code.md Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
02_Release_Process.md Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
03_Documentation.md DOCS: Corrected version of master in line 22. 2015-06-24 21:07:32 +12:00
04_Translations.md Making docs gender agnostic 2015-03-07 12:32:04 +00:00
05_Translation_Process.md Update 05_Translation_Process.md 2015-06-18 17:50:29 +12:00
06_Core_committers.md Removed Mateusz from core committer list. 2015-06-08 22:28:29 +12:00
07_Code_of_conduct.md Update 07_Code_of_conduct.md 2015-06-26 21:39:54 +12:00
index.md DOCS Reference to ensure contributors read over the Code of conduct 2015-02-16 10:28:52 +13:00