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

a01d10e5

Commit a01d10e5 authored 13 years ago by Georg Ehrke

Downloads
- Plain Diff

Merge branch 'master' into calendar

parents 4cbae823 db2fb387

Branches

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.htaccess 4 additions, 0 deletions

.htaccess
apps/remoteStorage/compat.php 1 addition, 1 deletion

apps/remoteStorage/compat.php
core/img/filetypes/code-script.png 0 additions, 0 deletions

core/img/filetypes/code-script.png
core/img/filetypes/text-x-php.png 0 additions, 0 deletions

core/img/filetypes/text-x-php.png
files/ajax/mimeicon.php 8 additions, 0 deletions

files/ajax/mimeicon.php
files/js/filelist.js 8 additions, 4 deletions

files/js/filelist.js
files/js/files.js 9 additions, 6 deletions

files/js/files.js
lib/base.php 8 additions, 0 deletions

lib/base.php
lib/helper.php 6 additions, 0 deletions

lib/helper.php
lib/setup.php 4 additions, 0 deletions

lib/setup.php
lib/util.php 2 additions, 3 deletions

lib/util.php

with 50 additions and 14 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