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

9c23c344

Commit 9c23c344 authored 11 years ago by Thomas Müller

Downloads
- Plain Diff

Merge branch 'master' into sharing_mail_notification_master

Conflicts:
	core/css/share.css

parents 8b08b1b4 de175a4b

Branches

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

apps/files/ajax/rawlist.php 0 additions, 4 deletions

apps/files/ajax/rawlist.php
apps/files/css/files.css 10 additions, 1 deletion

apps/files/css/files.css
apps/files/templates/index.php 1 addition, 1 deletion

apps/files/templates/index.php
apps/files/templates/part.list.php 7 additions, 8 deletions

apps/files/templates/part.list.php
core/css/share.css 69 additions, 67 deletions

core/css/share.css
core/css/styles.css 0 additions, 5 deletions

core/css/styles.css
core/img/places/link.png 0 additions, 0 deletions

core/img/places/link.png
core/img/places/link.svg 12 additions, 0 deletions

core/img/places/link.svg
lib/autoloader.php 1 addition, 0 deletions

lib/autoloader.php
lib/private/files/cache/upgrade.php 9 additions, 1 deletion

lib/private/files/cache/upgrade.php
tests/lib/autoloader.php 3 additions, 3 deletions

tests/lib/autoloader.php

with 112 additions and 90 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