Sam Minnee 65d20e4acc Simplified some of the code contribution guidelines. ... The current guides have a few areas where they recommend an approach that is more complex than what most people take. - Rebase straight onto upsteam/msaster - Force push a rebased branch I also fixed the conflict resolution help to be relevant to rebase commands, and kept the push instruction out of the rebase instruction.		2012-10-09 14:53:45 +13:00
..
contributing	Simplified some of the code contribution guidelines.	2012-10-09 14:53:45 +13:00
coding-conventions.md	Using new template controls in docs	2012-06-27 16:09:31 +02:00
index.md	Removed 'subversion' docs	2012-06-28 09:00:13 +02:00
module-release-process.md	API CHANGE Moved Translatable class into new 'translatable' module	2011-03-29 18:07:56 +13:00
release-process.md	API-CHANGE Update docs to match renaming of sapphire to framework	2012-04-15 10:50:19 +12:00
ss-markdown.md	MINOR Updated coding conventions to require the 'public' keyword for class methods and variables	2012-01-30 23:13:42 +01:00
translation-process.md	Docs about merging back translations	2012-07-13 14:25:44 +02:00