Ingo Schommer f29d51f433 Merge remote-tracking branch 'origin/3.1' ... Conflicts: docs/en/reference/dataobject.md lang/es.yml		2013-12-19 20:23:09 +01:00
..
contributing	Merge branch '3.1'	2013-11-11 18:18:25 +11:00
coding-conventions.md	Consistently used dollar notation in template docs (see #1794)	2013-04-26 11:48:59 +02:00
index.md	Update module development, remove outdated release steps	2013-06-15 12:06:25 +12:00
release-process.md	Updated security release process with identifiers	2013-08-13 01:26:24 +02: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