Marcelo Sizer 55fbd7d439 Merge remote-tracking branch 'upstream/develop' into develop ...

Conflicts:
	locales/en/app.json

2013-12-30 10:33:08 -02:00

..

bg

allow multiple files for translations

2013-12-30 12:16:42 +01:00

cs

allow multiple files for translations

2013-12-30 12:16:42 +01:00

cu

allow multiple files for translations

2013-12-30 12:16:42 +01:00

de

allow multiple files for translations

2013-12-30 12:16:42 +01:00

el

allow multiple files for translations

2013-12-30 12:16:42 +01:00

en

allow multiple files for translations

2013-12-30 12:16:42 +01:00

es

allow multiple files for translations

2013-12-30 12:16:42 +01:00

fr

allow multiple files for translations

2013-12-30 12:16:42 +01:00

he

allow multiple files for translations

2013-12-30 12:16:42 +01:00

id

allow multiple files for translations

2013-12-30 12:16:42 +01:00

it

allow multiple files for translations

2013-12-30 12:16:42 +01:00

ja

allow multiple files for translations

2013-12-30 12:16:42 +01:00

nl

allow multiple files for translations

2013-12-30 12:16:42 +01:00

no

allow multiple files for translations

2013-12-30 12:16:42 +01:00

pl

allow multiple files for translations

2013-12-30 12:16:42 +01:00

pt

Merge remote-tracking branch 'upstream/develop' into develop

2013-12-30 10:33:08 -02:00

ru

allow multiple files for translations

2013-12-30 12:16:42 +01:00

sl

allow multiple files for translations

2013-12-30 12:16:42 +01:00

uk

allow multiple files for translations

2013-12-30 12:16:42 +01:00

ur

allow multiple files for translations

2013-12-30 12:16:42 +01:00