silverstripe-framework/lang
Damian Mooyman 88fdc75456 Merge remote-tracking branch 'composer/3.1' into 3
Conflicts:
	.editorconfig
	docs/en/00_Getting_Started/00_Server_Requirements.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
	docs/en/00_Getting_Started/04_Directory_Structure.md
	docs/en/00_Getting_Started/index.md
	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
	docs/en/01_Tutorials/03_Forms.md
	docs/en/01_Tutorials/04_Site_Search.md
	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
	docs/en/01_Tutorials/index.md
	docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
	docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
	docs/en/02_Developer_Guides/01_Templates/06_Themes.md
	docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
	docs/en/02_Developer_Guides/05_Extending/05_Injector.md
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/02_Developer_Guides/10_Email/index.md
	docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
	docs/en/02_Developer_Guides/14_Files/index.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
	docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
	docs/en/04_Changelogs/3.1.9.md
	docs/en/05_Contributing/00_Issues_and_Bugs.md
	docs/en/05_Contributing/02_Release_Process.md
	docs/en/05_Contributing/03_Documentation.md
	filesystem/File.php
	filesystem/GD.php
	model/DataDifferencer.php
	model/Versioned.php
	security/BasicAuth.php
	security/Member.php
	tests/filesystem/FileTest.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/VersionedTest.php
	tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00
..
_manifest_exclude #1476 Patch for ticket #128 and a few other changes 2007-10-22 01:51:02 +00:00
af.yml Update translation masters 2014-05-13 10:54:33 +12:00
ar.yml Update translation masters 2014-05-13 10:54:33 +12:00
ast.yml Updated translations 2013-11-08 00:58:24 +01:00
az.yml Updated translations 2013-11-08 00:58:24 +01:00
bg.yml Update translation masters 2014-05-13 10:54:33 +12:00
bs.yml Update translation masters 2014-05-13 10:54:33 +12:00
ca.yml Update translation masters 2014-05-13 10:54:33 +12:00
cs.yml Update translation masters 2014-05-06 17:38:58 +12:00
da.yml Update translation masters 2014-05-13 10:54:33 +12:00
de.yml Merge remote-tracking branch 'origin/3.1' 2014-06-15 22:50:20 +12:00
el.yml Translations: Switch to Transifex format 2013-08-07 00:25:16 +02:00
en_GB.yml Update translation masters 2014-05-06 17:38:58 +12:00
en.yml Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
eo.yml Update translations 2014-08-05 15:02:18 +12:00
es_AR.yml Update translation masters 2014-05-13 10:54:33 +12:00
es_MX.yml Update translation masters 2014-05-13 10:54:33 +12:00
es.yml Merge remote-tracking branch 'origin/3.1' 2014-05-12 11:32:22 +12:00
et_EE.yml Merge remote-tracking branch 'origin/3.1' 2014-06-15 22:50:20 +12:00
fa_IR.yml Update translation masters 2014-05-13 10:54:33 +12:00
fi.yml Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 18:52:46 +13:00
fo.yml Update translation masters 2014-05-13 10:54:33 +12:00
fr.yml Update translation masters 2014-05-13 10:54:33 +12:00
gl_ES.yml Update translation masters 2014-05-13 10:54:33 +12:00
he_IL.yml Update translation masters 2014-05-13 10:54:33 +12:00
hi.yml Updated translations 2013-11-08 00:58:24 +01:00
hr.yml Update translations 2014-11-08 17:07:40 +13:00
hu.yml Update translation masters 2014-05-13 10:54:33 +12:00
hy_AM.yml Translations: Switch to Transifex format 2013-08-07 00:25:16 +02:00
id.yml Updated translations 2013-11-08 00:58:24 +01:00
is.yml Updated translations 2013-11-08 00:58:24 +01:00
it.yml Update translation masters 2014-05-13 10:54:33 +12:00
ja.yml Update translation masters 2014-05-13 10:54:33 +12:00
km.yml Updated translations 2013-11-08 00:58:24 +01:00
lt.yml Update translations 2015-01-12 17:54:49 +13:00
lv.yml Updated translations 2013-11-08 00:58:24 +01:00
mi.yml Update translation masters 2014-05-13 10:54:33 +12:00
ms.yml Updated translations 2013-11-08 00:58:24 +01:00
nb.yml Update translation masters 2014-05-13 10:54:33 +12:00
ne.yml Updated translations 2013-11-08 00:58:24 +01:00
nl.yml Update translations 2014-08-05 15:02:18 +12:00
pa.yml Updated translations 2013-11-08 00:58:24 +01:00
pl.yml Update translation masters 2014-05-13 10:54:33 +12:00
pt_BR.yml Update translation masters 2014-05-13 10:54:33 +12:00
pt.yml Update translation masters 2014-05-13 10:54:33 +12:00
ro.yml Updated translations 2014-02-18 11:49:55 +13:00
ru.yml Update translation masters 2014-05-13 10:54:33 +12:00
si.yml Update translation masters 2014-05-13 10:54:33 +12:00
sk.yml Update translation masters 2014-05-13 10:54:33 +12:00
sl.yml Update translations 2014-08-05 15:02:18 +12:00
sr_RS.yml Update translation masters 2014-05-13 10:54:33 +12:00
sr.yml Update translation masters 2014-05-13 10:54:33 +12:00
sv.yml Update translations 2014-11-08 17:07:40 +13:00
th.yml Update translation masters 2014-05-13 10:54:33 +12:00
tr.yml Update translations 2014-11-08 17:07:40 +13:00
uk.yml Update translation masters 2014-05-13 10:54:33 +12:00
uz.yml Translations: Switch to Transifex format 2013-08-07 00:25:16 +02:00
vi_VN.yml Updated translations 2013-11-08 00:58:24 +01:00
vi.yml Updated translations 2014-02-18 11:49:55 +13:00
zh_CN.yml Update translation masters 2014-05-13 10:54:33 +12:00
zh_TW.yml Update translation masters 2014-05-13 10:54:33 +12:00
zh.yml Update translation masters 2014-05-13 10:54:33 +12:00