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

78e54101

Commit 78e54101 authored 10 years ago by Thomas Müller

Downloads
- Plain Diff

Merge branch 'master' into jshint-globals-oc-t-n

Conflicts:
	.jshintrc

parents d7bc23e1 1e559f72

No related branches found

No related tags found

Loading

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.jshintrc 1 addition, 0 deletions

.jshintrc
apps/files/templates/fileexists.html 2 additions, 2 deletions

apps/files/templates/fileexists.html
core/js/core.json 2 additions, 1 deletion

core/js/core.json
core/js/oc-dialogs.js 11 additions, 8 deletions

core/js/oc-dialogs.js
core/js/underscore.js 1344 additions, 0 deletions

core/js/underscore.js
lib/base.php 1 addition, 0 deletions

lib/base.php
lib/private/defaults.php 2 additions, 2 deletions

lib/private/defaults.php
public.php 14 additions, 6 deletions

public.php
settings/js/personal.js 47 additions, 50 deletions

settings/js/personal.js

with 1424 additions and 69 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