Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
1bdfe395
Commit
1bdfe395
authored
14 years ago
by
Robin Appelman
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of gitorious.org:owncloud/owncloud
Conflicts: inc/lib_log.php
parents
c718716e
11d515ef
Branches
Branches containing commit
No related tags found
Loading
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
inc/lib_log.php
+0
-1
0 additions, 1 deletion
inc/lib_log.php
inc/lib_user.php
+9
-1
9 additions, 1 deletion
inc/lib_user.php
with
9 additions
and
2 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
