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

6930af4c

Commit 6930af4c authored 13 years ago by Georg Ehrke

Downloads
- Plain Diff

Merge branch 'master' into movable_apps_2

parents 78b2da58 d96e962f

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

apps/files_versions/ajax/getVersions.php 61 additions, 0 deletions

apps/files_versions/ajax/getVersions.php
apps/files_versions/ajax/rollbackVersion.php 26 additions, 0 deletions

apps/files_versions/ajax/rollbackVersion.php
apps/files_versions/history.php 8 additions, 3 deletions

apps/files_versions/history.php
apps/files_versions/js/versions.js 70 additions, 31 deletions

apps/files_versions/js/versions.js
apps/files_versions/templates/history.php 6 additions, 2 deletions

apps/files_versions/templates/history.php
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

with 185 additions and 42 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