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

0ba49811

Commit 0ba49811 authored 11 years ago by Christopher Schäpers

Downloads
- Plain Diff

Merge branch 'master' into oc_avatars

Conflicts:
	3rdparty

parents bdf48a6d cebb6359

Branches

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 3 additions, 0 deletions

.gitignore
3rdparty 1 addition, 1 deletion

3rdparty
config/config.sample.php 12 additions, 3 deletions

config/config.sample.php
core/js/js.js 1 addition, 0 deletions

core/js/js.js
core/js/placeholder.js 65 additions, 0 deletions

core/js/placeholder.js
lib/base.php 16 additions, 0 deletions

lib/base.php
lib/log/rotate.php 35 additions, 0 deletions

lib/log/rotate.php

with 133 additions and 4 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