diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-08-30 21:49:28 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-08-30 21:49:28 +0200 |
| commit | b483f2aab856e3324026588a9702043072fd7ad2 (patch) | |
| tree | 9a5696d43ae53160bee592e1b6874185cbd98ad4 /l10n/af/files.po | |
| parent | cbaf858dea0f2094805edb6aa223bdd6877fff5b (diff) | |
| parent | 598815b21e94219eb66684c64802e165a35180ad (diff) | |
| download | nextcloud-server-b483f2aab856e3324026588a9702043072fd7ad2.tar.gz nextcloud-server-b483f2aab856e3324026588a9702043072fd7ad2.zip | |
Merge branch 'master' into routing
Conflicts:
apps/contacts/js/contacts.js
apps/contacts/lib/search.php
apps/files_archive/js/archive.js
apps/gallery/lib/tiles.php
apps/gallery/templates/index.php
lib/ocs.php
Diffstat (limited to 'l10n/af/files.po')
0 files changed, 0 insertions, 0 deletions