diff options
author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 22:26:55 +0200 |
---|---|---|
committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 22:26:55 +0200 |
commit | dc18e65b4675d1d458a42ef8e6125bf6680ba157 (patch) | |
tree | 30072917dd3290cd65a8cfac764feb26e56594c1 /l10n/ru | |
parent | 8ddea7e95cc19e7880f2334e2c8d43b8c4e02ee0 (diff) | |
parent | 12818093007d5bdce5519b5015e2a0748c98e24d (diff) | |
download | nextcloud-server-dc18e65b4675d1d458a42ef8e6125bf6680ba157.tar.gz nextcloud-server-dc18e65b4675d1d458a42ef8e6125bf6680ba157.zip |
fix merge conflicts
Diffstat (limited to 'l10n/ru')
0 files changed, 0 insertions, 0 deletions