Merge branch 'master' of git://github.com/splitbrain/dokuwiki into media-revisions (3dd4a911) · 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

3dd4a911

Commit 3dd4a911 authored 13 years ago by Kate Arzamastseva

Downloads
- Plain Diff

Merge branch 'master' of git://github.com/splitbrain/dokuwiki into media-revisions

parents c439558b 1e542e41

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

inc/html.php 13 additions, 3 deletions

inc/html.php
inc/media.php 2 additions, 7 deletions

inc/media.php
lib/exe/ajax.php 6 additions, 12 deletions

lib/exe/ajax.php
lib/plugins/acl/admin.php 2 additions, 9 deletions

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

lib/plugins/acl/ajax.php
lib/plugins/plugin/classes/ap_download.class.php 1 addition, 1 deletion

lib/plugins/plugin/classes/ap_download.class.php
lib/scripts/media.js 4 additions, 5 deletions

lib/scripts/media.js
lib/scripts/tree.js 15 additions, 13 deletions

lib/scripts/tree.js

with 47 additions and 57 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