diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-14 22:54:48 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-14 22:54:48 +0100 |
| commit | 4b80466880b4e2daf25e38d621a0ebac608d335d (patch) | |
| tree | dfdcac5eb81cea7853d16c50ea3043c4642f3c15 /apps/files/l10n/pt_PT.php | |
| parent | 78a3625ddfc67e7e6743a2ff6fd31e1566b174c8 (diff) | |
| parent | 9058d398a7b9aac58ab4aa7379e13ca83c72281d (diff) | |
| download | nextcloud-server-4b80466880b4e2daf25e38d621a0ebac608d335d.tar.gz nextcloud-server-4b80466880b4e2daf25e38d621a0ebac608d335d.zip | |
Merge branch 'master' into master-sqlserver
Conflicts:
lib/db.php
lib/files/cache/cache.php
lib/files/cache/legacy.php
lib/setup.php
Diffstat (limited to 'apps/files/l10n/pt_PT.php')
0 files changed, 0 insertions, 0 deletions