diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-08 11:23:58 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-08 11:23:58 +0200 |
| commit | f43fd1765e7d399e144615c172eacc24f8636a11 (patch) | |
| tree | 9c8c0054f10639db2034b479dabd8e33af974474 /l10n/ja_JP/media.po | |
| parent | fa0c45b005665876d9365674c247fc9212f05df9 (diff) | |
| parent | 4768510923f6bfa3f3473874395a7a61872f1df0 (diff) | |
| download | nextcloud-server-f43fd1765e7d399e144615c172eacc24f8636a11.tar.gz nextcloud-server-f43fd1765e7d399e144615c172eacc24f8636a11.zip | |
fix merge conflicts
Diffstat (limited to 'l10n/ja_JP/media.po')
0 files changed, 0 insertions, 0 deletions