Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

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

Snippets Groups Projects

21bdc90c

Commit 21bdc90c authored 13 years ago by Andreas Gohr

Downloads
- Plain Diff

Merge branch 'master' into htmlmail

Conflicts:
	inc/auth.php

parents c9a53c46 d415c852

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

lib/plugins/config/lang/de-informal/lang.php 3 additions, 3 deletions

lib/plugins/config/lang/de-informal/lang.php
lib/plugins/config/lang/de/lang.php 4 additions, 10 deletions

lib/plugins/config/lang/de/lang.php
lib/plugins/plugin/lang/de/lang.php 1 addition, 1 deletion

lib/plugins/plugin/lang/de/lang.php
lib/plugins/usermanager/lang/de-informal/lang.php 2 additions, 2 deletions

lib/plugins/usermanager/lang/de-informal/lang.php
lib/plugins/usermanager/lang/de/lang.php 2 additions, 2 deletions

lib/plugins/usermanager/lang/de/lang.php

with 12 additions and 18 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