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

e202c299

Commit e202c299 authored 13 years ago by Michael Gapczynski

Downloads
- Plain Diff

Merge branch 'master' into sharing

Conflicts:
	.gitignore

parents 163c490c 89a6f16e

Branches

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 4 deletions

.gitignore
files/index.php 2 additions, 2 deletions

files/index.php
files/js/admin.js 15 additions, 0 deletions

files/js/admin.js
files/js/files.js 2 additions, 2 deletions

files/js/files.js
files/templates/admin.php 4 additions, 12 deletions

files/templates/admin.php

with 24 additions and 20 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