summaryrefslogtreecommitdiffstats
path: root/l10n/ru
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-04-15 22:26:55 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-04-15 22:26:55 +0200
commitdc18e65b4675d1d458a42ef8e6125bf6680ba157 (patch)
tree30072917dd3290cd65a8cfac764feb26e56594c1 /l10n/ru
parent8ddea7e95cc19e7880f2334e2c8d43b8c4e02ee0 (diff)
parent12818093007d5bdce5519b5015e2a0748c98e24d (diff)
downloadnextcloud-server-dc18e65b4675d1d458a42ef8e6125bf6680ba157.tar.gz
nextcloud-server-dc18e65b4675d1d458a42ef8e6125bf6680ba157.zip
fix merge conflicts
Diffstat (limited to 'l10n/ru')
0 files changed, 0 insertions, 0 deletions