Damian Mooyman dff65867cc Merge remote-tracking branch 'origin/3.1' into 3 ...

Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php

2015-02-20 10:17:19 +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

Update translations

2015-02-16 11:55:17 +13: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-02-16 11:55:17 +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