Merge branch 'requireall' (d7879495) · Commits · BRIC / dokuwiki · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

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

Snippets Groups Projects

d7879495

Commit d7879495 authored 15 years ago by Andreas Gohr

Downloads
- Plain Diff

Merge branch 'requireall'

Conflicts:
	inc/fulltext.php

parents 84645d8c 05ed2c25

No related branches found

No related tags found

No related merge requests found

Changes 47

Hide whitespace changes

Inline Side-by-side

Showing

doku.php 1 addition, 6 deletions

doku.php
feed.php 0 additions, 7 deletions

feed.php
inc/FeedParser.php 0 additions, 3 deletions

inc/FeedParser.php
inc/IXR_Library.php 0 additions, 1 deletion

inc/IXR_Library.php
inc/JSON.php 0 additions, 1 deletion

inc/JSON.php
inc/actions.php 0 additions, 3 deletions

inc/actions.php
inc/auth.php 52 additions, 48 deletions

inc/auth.php
inc/cache.php 0 additions, 3 deletions

inc/cache.php
inc/common.php 0 additions, 9 deletions

inc/common.php
inc/events.php 0 additions, 1 deletion

inc/events.php
inc/form.php 0 additions, 1 deletion

inc/form.php
inc/fulltext.php 0 additions, 2 deletions

inc/fulltext.php
inc/html.php 0 additions, 7 deletions

inc/html.php
inc/indexer.php 0 additions, 3 deletions

inc/indexer.php
inc/infoutils.php 0 additions, 2 deletions

inc/infoutils.php
inc/init.php 8 additions, 5 deletions

inc/init.php
inc/io.php 0 additions, 4 deletions

inc/io.php
inc/load.php 89 additions, 0 deletions

inc/load.php
inc/mail.php 0 additions, 2 deletions

inc/mail.php
inc/media.php 0 additions, 5 deletions

inc/media.php

with 150 additions and 113 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