diff options
| author | Iván Eixarch <miao.org@gmail.com> | 2012-12-03 01:39:59 +0100 |
|---|---|---|
| committer | Iván Eixarch <miao.org@gmail.com> | 2012-12-03 01:39:59 +0100 |
| commit | 657322db91a38067a5ecc375e01d4886844abec6 (patch) | |
| tree | f8417a1564484ae7b931897cd6c91657835af327 /src/locales/zh-hant.ini | |
| parent | 97d77ea089c75fc64fef94b9259674d738a930cb (diff) | |
| parent | 8a9045b3358ea6b60cdb7d9d8e19ed0cb545d950 (diff) | |
| download | etherpad-lite-657322db91a38067a5ecc375e01d4886844abec6.zip | |
fixed git merge confict
Diffstat (limited to 'src/locales/zh-hant.ini')
0 files changed, 0 insertions, 0 deletions