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

60ce492f

Commit 60ce492f authored 11 years ago by Thomas Müller

Downloads
- Plain Diff

Merge branch 'master' into groups

parents fb40d9e1 5fc0535f

Branches

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

lib/template.php 41 additions, 286 deletions

lib/template.php
lib/template/base.php 131 additions, 0 deletions

lib/template/base.php
lib/template/cssresourcelocator.php 43 additions, 0 deletions

lib/template/cssresourcelocator.php
lib/template/functions.php 120 additions, 0 deletions

lib/template/functions.php
lib/template/jsresourcelocator.php 43 additions, 0 deletions

lib/template/jsresourcelocator.php
lib/template/resourcelocator.php 70 additions, 0 deletions

lib/template/resourcelocator.php
lib/template/templatefilelocator.php 44 additions, 0 deletions

lib/template/templatefilelocator.php
lib/templatelayout.php 10 additions, 104 deletions

lib/templatelayout.php
tests/lib/template/resourcelocator.php 69 additions, 0 deletions

tests/lib/template/resourcelocator.php

with 571 additions and 390 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