diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-14 10:20:00 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-14 10:22:13 -0400 |
| commit | 4c7fd8cd0191871e48704f693f48554d4ee7a726 (patch) | |
| tree | a66a930783de938deaa3d2362dcf779e5c2b45af /l10n/nb_NO/bookmarks.po | |
| parent | 64ef1e21819979d7fdc406d2628bc175b16fe554 (diff) | |
| parent | 62e4f55f721971dacd06649cecefe0487626aa75 (diff) | |
| download | nextcloud-server-4c7fd8cd0191871e48704f693f48554d4ee7a726.tar.gz nextcloud-server-4c7fd8cd0191871e48704f693f48554d4ee7a726.zip | |
Merge branch 'master' into share_api
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
Diffstat (limited to 'l10n/nb_NO/bookmarks.po')
0 files changed, 0 insertions, 0 deletions