Merge branch 'master' into svgpagetools (a54c8d9e) · 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

a54c8d9e

Commit a54c8d9e authored 8 years ago by Andreas Gohr

Downloads
- Plain Diff

Merge branch 'master' into svgpagetools

* master:
  translation update
  fixed typo in function name
  translation update

parents b4b0a666 d70f846e

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

_test/tests/inc/common_inlineSVG.test.php 2 additions, 2 deletions

_test/tests/inc/common_inlineSVG.test.php
inc/Ui/Admin.php 1 addition, 1 deletion

inc/Ui/Admin.php
inc/common.php 1 addition, 1 deletion

inc/common.php
inc/lang/zh/lang.php 1 addition, 0 deletions

inc/lang/zh/lang.php
lib/plugins/config/lang/ja/lang.php 4 additions, 0 deletions

lib/plugins/config/lang/ja/lang.php
lib/plugins/config/lang/zh/lang.php 4 additions, 0 deletions

lib/plugins/config/lang/zh/lang.php

with 13 additions and 4 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