Ingo Schommer afe06661ef Merge remote-tracking branch 'origin/3.0' into 3.1 ...

Conflicts:
	admin/templates/Includes/LeftAndMain_Menu.ss
	admin/templates/Includes/ModelAdmin_ImportSpec.ss
	admin/templates/Includes/ModelAdmin_Tools.ss
	admin/templates/LeftAndMain.ss
	admin/templates/ModelSidebar.ss
	i18n/i18n.php
	templates/ComplexTableField.ss
	templates/ComplexTableField_popup.ss
	templates/FileIFrameField_iframe.ss
	templates/Includes/GridFieldItemEditView.ss
	templates/Includes/TableListField_PageControls.ss
	templates/RelationComplexTableField.ss
	templates/TableField.ss
	templates/TableListField.ss

2013-08-07 17:14:47 +02:00

..

_manifest_exclude

#1476 Patch for ticket #128 and a few other changes

2007-10-22 01:51:02 +00:00

af.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

ar.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

ast.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

az.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

bg.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

bs.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

ca.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

cs.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

da.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

de.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

el.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

en_GB.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

en.yml

Merge remote-tracking branch 'origin/3.0' into 3.1

2013-08-07 17:14:47 +02:00

eo.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

es_AR.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

es_MX.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

es.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

et_EE.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

fa_IR.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

fi.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

fo.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

fr.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

gl_ES.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

he_IL.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

hi.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

hr.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

hu.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

hy_AM.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

id.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

is.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

it.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

ja_JP.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

km.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

lt.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

lv.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

mi.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

ms.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

nb.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

ne.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

nl.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

pa.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

pl.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

pt_BR.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

pt.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

ro.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

ru.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

si.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

sk.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

sl.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

sr.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

sv.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

th.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

tr.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

uk.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

uz.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

vi_VN.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

zh_CN.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00

zh_TW.yml

Translations: Switch to Transifex format

2013-08-07 00:25:16 +02:00