Merge branch 'datauris' (0a9349a6) · 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

0a9349a6

Commit 0a9349a6 authored 13 years ago by Andreas Gohr

Downloads
- Plain Diff

Merge branch 'datauris'

Conflicts:
	lib/exe/css.php

parents bf1ec652 28f4004c

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

conf/dokuwiki.php 1 addition, 0 deletions

conf/dokuwiki.php
lib/exe/css.php 35 additions, 2 deletions

lib/exe/css.php
lib/plugins/config/lang/en/lang.php 1 addition, 0 deletions

lib/plugins/config/lang/en/lang.php
lib/plugins/config/settings/config.metadata.php 1 addition, 0 deletions

lib/plugins/config/settings/config.metadata.php

with 38 additions and 2 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