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

7b9fb84f

Commit 7b9fb84f authored 13 years ago by Robin Appelman

Downloads
- Plain Diff

Merge branch 'master' into filesystem

parents d514b1d9 f1982965

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

apps/bookmarks/css/bookmarks.css 27 additions, 20 deletions

apps/bookmarks/css/bookmarks.css
apps/bookmarks/js/bookmarks.js 8 additions, 6 deletions

apps/bookmarks/js/bookmarks.js
apps/gallery/js/albums.js 6 additions, 6 deletions

apps/gallery/js/albums.js
files/css/files.css 2 additions, 1 deletion

files/css/files.css
files/templates/index.php 2 additions, 5 deletions

files/templates/index.php

with 45 additions and 38 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