Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

our_own_cloud_project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

952433ea

Commit 952433ea authored 11 years ago by Thomas Müller

Downloads
- Plain Diff

Merge branch 'master' into move-aborted-upload-detection-into-plugin-master

parents 46e47be7 5899485c

No related branches found

No related tags found

Loading

Changes 67

Hide whitespace changes

Inline Side-by-side

Showing

apps/files/l10n/el.php 1 addition, 0 deletions

apps/files/l10n/el.php
apps/files/l10n/hu_HU.php 10 additions, 3 deletions

apps/files/l10n/hu_HU.php
apps/files/l10n/uk.php 3 additions, 2 deletions

apps/files/l10n/uk.php
apps/files_encryption/l10n/uk.php 1 addition, 0 deletions

apps/files_encryption/l10n/uk.php
apps/files_encryption/lib/keymanager.php 4 additions, 1 deletion

apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/proxy.php 3 additions, 4 deletions

apps/files_encryption/lib/proxy.php
apps/files_sharing/lib/cache.php 69 additions, 9 deletions

apps/files_sharing/lib/cache.php
apps/files_trashbin/l10n/hu_HU.php 2 additions, 2 deletions

apps/files_trashbin/l10n/hu_HU.php
apps/user_ldap/l10n/hu_HU.php 8 additions, 0 deletions

apps/user_ldap/l10n/hu_HU.php
core/avatar/controller.php 1 addition, 1 deletion

core/avatar/controller.php
core/css/apps.css 2 additions, 1 deletion

core/css/apps.css
core/js/jquery.avatar.js 5 additions, 1 deletion

core/js/jquery.avatar.js
core/js/placeholder.js 13 additions, 2 deletions

core/js/placeholder.js
core/js/share.js 2 additions, 2 deletions

core/js/share.js
core/l10n/cs_CZ.php 1 addition, 0 deletions

core/l10n/cs_CZ.php
core/l10n/da.php 2 additions, 0 deletions

core/l10n/da.php
core/l10n/fr.php 5 additions, 0 deletions

core/l10n/fr.php
core/l10n/it.php 5 additions, 5 deletions

core/l10n/it.php
core/l10n/sv.php 15 additions, 1 deletion

core/l10n/sv.php
l10n/cs_CZ/core.po 11 additions, 11 deletions

l10n/cs_CZ/core.po

with 163 additions and 45 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment