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

11b3c10c

Commit 11b3c10c authored Aug 11, 2011 by Dawid Opis

Downloads
- Plain Diff

resolved merge conflicts

parents 9683d446 ce9b36fd

No related merge requests found

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

.htaccess 3 additions, 3 deletions

.htaccess
admin/css/users.css 7 additions, 6 deletions

admin/css/users.css
admin/js/users.js 5 additions, 1 deletion

admin/js/users.js
admin/templates/users.php 14 additions, 13 deletions

admin/templates/users.php
apps/files_publiclink/templates/admin.php 4 additions, 6 deletions

apps/files_publiclink/templates/admin.php
core/css/styles.css 2 additions, 2 deletions

core/css/styles.css
core/js/js.js 16 additions, 0 deletions

core/js/js.js
files/css/files.css 2 additions, 0 deletions

files/css/files.css
files/templates/index.php 4 additions, 3 deletions

files/templates/index.php
files/templates/part.list.php 2 additions, 2 deletions

files/templates/part.list.php

with 59 additions and 36 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