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

d96e962f

Commit d96e962f authored 13 years ago by Sam Tuke

Downloads
- Plain Diff

Merge branch 'master' of gitorious.org:owncloud/owncloud

parents 18a024e2 6bdefef3

Branches

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

apps/files_sharing/ajax/email.php 15 additions, 0 deletions

apps/files_sharing/ajax/email.php
apps/files_sharing/js/share.js 19 additions, 2 deletions

apps/files_sharing/js/share.js
core/lostpassword/index.php 13 additions, 6 deletions

core/lostpassword/index.php
core/lostpassword/templates/lostpassword.php 1 addition, 0 deletions

core/lostpassword/templates/lostpassword.php
settings/templates/help.php 1 addition, 0 deletions

settings/templates/help.php

with 49 additions and 8 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