Kim Gardner bf1fbfe03f Fix merge conflicts on master

2018-01-04 16:43:51 -05:00

..

da.yml

Update permalink copy to Share on stream

2017-12-18 13:09:39 -05:00

en.yml

Merge branch 'master' into i18n-serverside-plugins

2017-12-18 16:44:23 -06:00

es.yml

Update permalink copy to Share on stream

2017-12-18 13:09:39 -05:00

fr.yml

Update permalink copy to Share on stream

2017-12-18 13:09:39 -05:00

pt_BR.yml

Update permalink copy to Share on stream

2017-12-18 13:09:39 -05:00

zh_CN.yml

Refine zh_CN translation

2017-12-26 12:08:47 +08:00

zh_TW.yml

Fix merge conflicts on master

2018-01-04 16:43:51 -05:00