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

bb26fe93

Commit bb26fe93 authored 13 years ago by Marvin Thomas Rabe

Downloads
- Plain Diff

Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud...

Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud into merge-requests/55

parents ae56bb63 c853fc75

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 4 additions, 1 deletion

.gitignore
apps/calendar/templates/settings.php 26 additions, 47 deletions

apps/calendar/templates/settings.php
apps/gallery/ajax/cover.php 1 addition, 1 deletion

apps/gallery/ajax/cover.php
apps/gallery/ajax/getAlbums.php 2 additions, 2 deletions

apps/gallery/ajax/getAlbums.php
apps/gallery/ajax/getCovers.php 1 addition, 1 deletion

apps/gallery/ajax/getCovers.php
apps/gallery/appinfo/info.xml 1 addition, 2 deletions

apps/gallery/appinfo/info.xml
apps/gallery/lib_scanner.php 5 additions, 5 deletions

apps/gallery/lib_scanner.php
apps/remoteStorage/lib_remoteStorage.php 1 addition, 1 deletion

apps/remoteStorage/lib_remoteStorage.php

with 41 additions and 60 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