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

e6384251

Commit e6384251 authored 12 years ago by Björn Schießle

Downloads
- Plain Diff

Merge branch 'master' of gitorious.org:owncloud/owncloud

parents d496a5e1 2f00384b

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

apps/user_openid/appinfo/info.xml 1 addition, 0 deletions

apps/user_openid/appinfo/info.xml
core/minimizer.php 2 additions, 2 deletions

core/minimizer.php
index.php 1 addition, 0 deletions

index.php
lib/base.php 0 additions, 34 deletions

lib/base.php
lib/minimizer.php 1 addition, 12 deletions

lib/minimizer.php
lib/minimizer/css.php 0 additions, 44 deletions

lib/minimizer/css.php
lib/minimizer/js.php 0 additions, 43 deletions

lib/minimizer/js.php
lib/template.php 40 additions, 127 deletions

lib/template.php
lib/templatelayout.php 170 additions, 0 deletions

lib/templatelayout.php

with 215 additions and 262 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