diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-01-14 10:24:40 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-01-14 10:24:40 +0100 |
| commit | e0173303e6a3ff2048422f47db7ce3d97a70c761 (patch) | |
| tree | d5d735b199a23ffa5d8f7264ae9b16d86f9de562 /l10n/zh_HK | |
| parent | b69328e1d1f0888c2541e3f0be27e534f980adb4 (diff) | |
| parent | d276d21c764730a83e8a2e867e9198d6c89d3307 (diff) | |
| download | nextcloud-server-e0173303e6a3ff2048422f47db7ce3d97a70c761.tar.gz nextcloud-server-e0173303e6a3ff2048422f47db7ce3d97a70c761.zip | |
merge conflict fixed, settings-personal.php is no longer needed
Conflicts:
apps/files_versions/templates/settings-personal.php
Diffstat (limited to 'l10n/zh_HK')
0 files changed, 0 insertions, 0 deletions