diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2013-02-04 18:38:21 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2013-02-04 18:38:21 +0000 |
| commit | 1a6f347405d4bbb0df267c41fb4f39a8422a1041 (patch) | |
| tree | 768a9f086b971d9295d12be244a024a3926a2c04 /l10n/nn_NO | |
| parent | 406922fc6a49fc8a46dbfea5186cbfcd44938d3e (diff) | |
| parent | 8b9cabf51440b75fab21f4e788d7fc582eeb6337 (diff) | |
| download | nextcloud-server-1a6f347405d4bbb0df267c41fb4f39a8422a1041.tar.gz nextcloud-server-1a6f347405d4bbb0df267c41fb4f39a8422a1041.zip | |
Fix merge conflict
Diffstat (limited to 'l10n/nn_NO')
0 files changed, 0 insertions, 0 deletions