Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dokuwiki
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

bf815306

Commit bf815306 authored 14 years ago by Anika Henke

Downloads
- Plain Diff

Merge branch 'master' of github.com:splitbrain/dokuwiki

parents ef362bb8 e6a6dbfe

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

inc/auth.php 3 additions, 2 deletions

inc/auth.php
inc/auth/plain.class.php 16 additions, 10 deletions

inc/auth/plain.class.php
inc/config_cascade.php 57 additions, 0 deletions

inc/config_cascade.php
inc/init.php 1 addition, 43 deletions

inc/init.php
inc/lang/en/lang.php 1 addition, 0 deletions

inc/lang/en/lang.php
inc/parser/parser.php 2 additions, 2 deletions

inc/parser/parser.php
lib/exe/mediamanager.php 6 additions, 0 deletions

lib/exe/mediamanager.php
lib/plugins/acl/admin.php 7 additions, 4 deletions

lib/plugins/acl/admin.php

with 93 additions and 61 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