Belen Curcio c9ae622ec3 merge conflicts

2017-10-12 13:00:16 -03:00

..

da.yml

fixed more yaml issues, added lint step

2017-10-10 14:04:37 -06:00

en.yml

merge conflicts

2017-10-12 13:00:16 -03:00

es.yml

Translations and PropTypes

2017-10-10 02:48:12 -03:00

fr.yml

displaying time in X minutes Y seconds

2017-10-05 10:48:12 +05:30

pt_BR.yml

Merge branch 'master' into master

2017-10-06 13:43:21 +02:00