Merge remote branch 'lupo49/master' (4ea48b36) · 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

4ea48b36

Commit 4ea48b36 authored 14 years ago by Andreas Gohr

Downloads
- Plain Diff

Merge remote branch 'lupo49/master'

Conflicts:
	inc/lang/de-informal/lang.php

parents 6ef71970 3d4b6cf5

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

inc/lang/de-informal/denied.txt 1 addition, 1 deletion

inc/lang/de-informal/denied.txt
inc/lang/de-informal/install.html 1 addition, 1 deletion

inc/lang/de-informal/install.html
inc/lang/de-informal/lang.php 24 additions, 0 deletions

inc/lang/de-informal/lang.php
inc/lang/de-informal/subscr_digest.txt 21 additions, 0 deletions

inc/lang/de-informal/subscr_digest.txt
inc/lang/de-informal/subscr_list.txt 1 addition, 1 deletion

inc/lang/de-informal/subscr_list.txt
inc/lang/de-informal/subscr_single.txt 24 additions, 0 deletions

inc/lang/de-informal/subscr_single.txt
lib/plugins/config/lang/de-informal/lang.php 66 additions, 5 deletions

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

lib/plugins/config/lang/de/lang.php
lib/plugins/popularity/lang/de-informal/intro.txt 1 addition, 1 deletion

lib/plugins/popularity/lang/de-informal/intro.txt
lib/plugins/revert/lang/de-informal/lang.php 3 additions, 2 deletions

lib/plugins/revert/lang/de-informal/lang.php

with 151 additions and 17 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