Damian Mooyman 2c1f837442 Merge branch '3.1' into 3.2 ...

# Conflicts:
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md
#	docs/en/02_Developer_Guides/00_Model/10_Versioning.md
#	docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
#	docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md
#	docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
#	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
#	docs/en/02_Developer_Guides/14_Files/01_Image.md
#	docs/en/02_Developer_Guides/14_Files/index.md
#	lang/cs.yml
#	lang/fi.yml
#	lang/sk.yml

2016-02-29 16:59:20 +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 translations

2016-02-19 10:54:36 +13:00

ar.yml

Update translations

2016-02-19 10:54:36 +13: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 translations

2016-02-19 10:54:36 +13:00

bs.yml

Update translations

2016-02-19 10:54:36 +13:00

ca.yml

Update translations

2015-09-02 11:15:53 +12:00

cs.yml

Update translations

2016-02-29 14:57:30 +13:00

da.yml

Update translations

2015-08-04 13:02:20 +12:00

de.yml

Update translations

2016-02-24 15:20:40 +13:00

el.yml

Update translations

2015-08-04 13:02:20 +12:00

en_GB.yml

Update translation masters

2014-05-06 17:38:58 +12:00

en.yml

Update translations

2016-02-19 10:54:36 +13:00

eo.yml

Update translations

2016-02-24 15:20:40 +13:00

es_AR.yml

Update translations

2015-09-02 11:15:53 +12:00

es_MX.yml

Update translations

2016-02-19 10:54:36 +13:00

es.yml

Update translations

2016-02-24 15:20:40 +13:00

et_EE.yml

Update translations

2016-02-19 10:54:36 +13:00

fa_IR.yml

Update translations

2016-02-24 15:20:40 +13:00

fi.yml

Merge branch '3.1' into 3.2

2016-02-29 16:59:20 +13:00

fo.yml

Update translations

2015-09-02 11:15:53 +12:00

fr.yml

Update translations

2016-02-19 10:54:36 +13:00

gl_ES.yml

Update translations

2016-02-19 10:54:36 +13:00

he_IL.yml

Update translations

2015-09-02 11:15:53 +12:00

hi.yml

Updated translations

2013-11-08 00:58:24 +01:00

hr.yml

Update translations

2016-02-19 10:54:36 +13:00

hu.yml

Update translations

2015-09-02 11:15:53 +12:00

hy_AM.yml

Translations: Switch to Transifex format

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

id_ID.yml

Update translations

2016-02-19 10:54:36 +13:00

id.yml

Update translations

2016-02-19 10:54:36 +13:00

is.yml

Updated translations

2013-11-08 00:58:24 +01:00

it.yml

Update translations

2016-02-29 14:57:30 +13:00

ja.yml

Update translations

2016-02-19 10:54:36 +13:00

km.yml

Updated translations

2013-11-08 00:58:24 +01:00

lt.yml

Update translations

2016-02-27 21:00:46 +13:00

lv.yml

Updated translations

2013-11-08 00:58:24 +01:00

mi.yml

Update translations

2016-02-19 10:54:36 +13:00

ms.yml

Updated translations

2013-11-08 00:58:24 +01:00

nb.yml

Update translations

2016-02-19 10:54:36 +13:00

ne.yml

Updated translations

2013-11-08 00:58:24 +01:00

nl.yml

Update translations

2016-02-19 10:54:36 +13:00

pa.yml

Updated translations

2013-11-08 00:58:24 +01:00

pl.yml

Update translations

2016-02-19 10:54:36 +13:00

pt_BR.yml

Update translations

2015-09-02 11:15:53 +12:00

pt.yml

Update translations

2016-02-19 10:54:36 +13:00

ro.yml

Update translations

2016-02-19 10:54:36 +13:00

ru.yml

Update translations

2016-02-19 10:54:36 +13:00

si.yml

Update translations

2015-09-02 11:15:53 +12:00

sk.yml

Update translations

2016-02-29 14:57:30 +13:00

sl.yml

Update translations

2016-02-19 10:54:36 +13:00

sr_RS.yml

Update translations

2016-02-19 10:54:36 +13:00

sr_RS@latin.yml

Update translations

2016-02-19 10:54:36 +13:00

sr.yml

Update translations

2016-02-19 10:54:36 +13:00

sr@latin.yml

Update translations

2016-02-19 10:54:36 +13:00

sv.yml

Update translations

2016-02-24 15:20:40 +13:00

th.yml

Update translations

2016-02-19 10:54:36 +13:00

tr.yml

Update translations

2015-11-11 17:06:45 +13:00

uk.yml

Update translations

2016-02-19 10:54:36 +13: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 translations

2015-09-02 11:15:53 +12:00

zh_TW.yml

Update translations

2015-09-02 11:15:53 +12:00

zh.yml

Update translations

2016-02-19 10:54:36 +13:00