Damian Mooyman 0ed1750106 Merge remote-tracking branch 'origin/3' ... # Conflicts: # .travis.yml # .tx/config # _config/database.yml # admin/code/LeftAndMain.php # admin/code/ModelAdmin.php # admin/code/SecurityAdmin.php # admin/javascript/jquery-changetracker/lib/jquery.changetracker.js # admin/javascript/lang/cs.js # admin/javascript/lang/de.js # admin/javascript/lang/eo.js # admin/javascript/lang/es.js # admin/javascript/lang/fa_IR.js # admin/javascript/lang/fi.js # admin/javascript/lang/fr.js # admin/javascript/lang/hr.js # admin/javascript/lang/id.js # admin/javascript/lang/id_ID.js # admin/javascript/lang/it.js # admin/javascript/lang/ja.js # admin/javascript/lang/lt.js # admin/javascript/lang/mi.js # admin/javascript/lang/nb.js # admin/javascript/lang/nl.js # admin/javascript/lang/pl.js # admin/javascript/lang/ro.js # admin/javascript/lang/ru.js # admin/javascript/lang/sk.js # admin/javascript/lang/sl.js # admin/javascript/lang/sl_SI.js # admin/javascript/lang/sr.js # admin/javascript/lang/sr@latin.js # admin/javascript/lang/sr_RS.js # admin/javascript/lang/sr_RS@latin.js # admin/javascript/lang/src/cs.js # admin/javascript/lang/src/de.js # admin/javascript/lang/src/eo.js # admin/javascript/lang/src/es.js # admin/javascript/lang/src/fa_IR.js # admin/javascript/lang/src/fi.js # admin/javascript/lang/src/fr.js # admin/javascript/lang/src/hr.js # admin/javascript/lang/src/id.js # admin/javascript/lang/src/id_ID.js # admin/javascript/lang/src/it.js # admin/javascript/lang/src/ja.js # admin/javascript/lang/src/lt.js # admin/javascript/lang/src/mi.js # admin/javascript/lang/src/nb.js # admin/javascript/lang/src/nl.js # admin/javascript/lang/src/pl.js # admin/javascript/lang/src/ro.js # admin/javascript/lang/src/ru.js # admin/javascript/lang/src/sk.js # admin/javascript/lang/src/sl.js # admin/javascript/lang/src/sl_SI.js # admin/javascript/lang/src/sr.js # admin/javascript/lang/src/sr@latin.js # admin/javascript/lang/src/sr_RS.js # admin/javascript/lang/src/sr_RS@latin.js # admin/javascript/lang/src/sv.js # admin/javascript/lang/src/zh.js # admin/javascript/lang/sv.js # admin/javascript/lang/zh.js # admin/templates/Includes/ModelAdmin_Content.ss # composer.json # control/HTTPRequest.php # core/Config.php # core/Core.php # core/Diff.php # core/Object.php # core/PaginatedList.php # core/TempPath.php # core/manifest/ConfigStaticManifest.php # dev/Profiler.php # docs/en/00_Getting_Started/00_Server_Requirements.md # docs/en/00_Getting_Started/03_Environment_Management.md # docs/en/02_Developer_Guides/01_Templates/03_Requirements.md # docs/en/02_Developer_Guides/07_Debugging/03_Template_debugging.md # docs/en/02_Developer_Guides/13_i18n/index.md # filesystem/File.php # filesystem/GD.php # filesystem/ImagickBackend.php # filesystem/Upload.php # forms/DatetimeField.php # forms/FormField.php # forms/GroupedDropdownField.php # forms/TabSet.php # forms/gridfield/GridFieldFilterHeader.php # javascript/lang/es.js # javascript/lang/src/es.js # lang/af.yml # lang/ar.yml # lang/az.yml # lang/bg.yml # lang/bs.yml # lang/ca.yml # lang/cs.yml # lang/de.yml # lang/en.yml # lang/eo.yml # lang/es.yml # lang/es_AR.yml # lang/es_MX.yml # lang/et_EE.yml # lang/fa_IR.yml # lang/fi.yml # lang/fo.yml # lang/fr.yml # lang/gl_ES.yml # lang/he_IL.yml # lang/hr.yml # lang/hu.yml # lang/id.yml # lang/id_ID.yml # lang/is.yml # lang/it.yml # lang/ja.yml # lang/lt.yml # lang/lv.yml # lang/mi.yml # lang/ms.yml # lang/nb.yml # lang/ne.yml # lang/nl.yml # lang/pl.yml # lang/pt.yml # lang/pt_BR.yml # lang/ro.yml # lang/ru.yml # lang/si.yml # lang/sk.yml # lang/sl.yml # lang/sl_SI.yml # lang/sr.yml # lang/sr@latin.yml # lang/sr_RS.yml # lang/sr_RS@latin.yml # lang/sv.yml # lang/th.yml # lang/tr.yml # lang/uk.yml # lang/zh.yml # lang/zh_CN.yml # lang/zh_TW.yml # model/DataDifferencer.php # model/DataQuery.php # model/Image.php # model/ManyManyList.php # model/connect/DBSchemaManager.php # model/connect/PDOConnector.php # model/fieldtypes/Bigint.php # model/fieldtypes/DBFloat.php # model/fieldtypes/DBInt.php # model/fieldtypes/Double.php # model/fieldtypes/ForeignKey.php # model/fieldtypes/PrimaryKey.php # parsers/HTML/HTMLBBCodeParser.php # security/Member.php # security/MemberAuthenticator.php # security/RandomGenerator.php # security/Security.php # tests/control/CookieTest.php # tests/control/HTTPRequestTest.php # tests/core/CoreTest.php # tests/filesystem/UploadTest.php # tests/forms/FormFieldTest.php # tests/forms/FormTest.php # tests/forms/GroupedDropdownFieldTest.php # tests/forms/HtmlEditorFieldToolbarTest.php # tests/forms/RequirementsTest.php # tests/model/DBFieldTest.php # tests/model/DataObjectTest.php # tests/model/ManyManyListTest.php # tests/model/VersionableExtensionsTest.php # tests/model/VersionedTest.php # tests/parsers/ShortcodeParserTest.php # tests/security/MemberAuthenticatorTest.php # tests/security/MemberTest.php # tests/security/SecurityTest.php # tests/view/SSViewerTest.php # thirdparty/simpletest/encoding.php # thirdparty/simpletest/page.php # thirdparty/simpletest/tag.php # thirdparty/spyc/spyc.php # thirdparty/tinymce-spellchecker/classes/SpellChecker.php # thirdparty/tinymce-spellchecker/classes/utils/JSON.php # thirdparty/tinymce-spellchecker/classes/utils/Logger.php # thirdparty/tinymce/tiny_mce.js # thirdparty/tinymce/tiny_mce_gzip.php # thirdparty/tinymce/tiny_mce_src.js # view/Requirements.php # view/SSViewer.php # view/ViewableData.php		2017-06-27 13:27:14 +12:00
..
en	Merge remote-tracking branch 'origin/3'	2017-06-27 13:27:14 +12:00
_manifest_exclude	ENHANCEMENT Added sapphire/docs (migrated from https://github.com/chillu/silverstripe-doc-restructuring)	2011-02-07 19:55:13 +13:00
LICENSE	ENHANCEMENT Added sapphire/docs (migrated from https://github.com/chillu/silverstripe-doc-restructuring)	2011-02-07 19:55:13 +13:00