diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
| commit | 8ccf9c9785ec2b626bad30a88a21f02886845418 (patch) | |
| tree | 0ecd6103880e3350bd37ba11ae3872805ede1755 /inc/lang/sl/diff.txt | |
| parent | e2092379b1c3200832cb569781ec647db5aeef0f (diff) | |
| parent | 23d27376b2a2f6a1ccf0777c48435717494d85b1 (diff) | |
| download | rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.gz rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
data/deleted.files
doku.php
lib/exe/xmlrpc.php
Diffstat (limited to 'inc/lang/sl/diff.txt')
| -rw-r--r-- | inc/lang/sl/diff.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/inc/lang/sl/diff.txt b/inc/lang/sl/diff.txt index f98f7e5ce..5cb2e3a12 100644 --- a/inc/lang/sl/diff.txt +++ b/inc/lang/sl/diff.txt @@ -1,4 +1,3 @@ -====== Primerjaj izbrane različice ====== - -Prikazana je razlika med izbrano in trenutno različico te strani. +====== Primerjava izbranih različic ====== +Prikazane so razlike med izbrano in trenutno različico strani. |