diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-06-03 16:13:26 +0200 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-06-03 16:13:26 +0200 |
| commit | 34f7d7455b707c2897c5ccc40c987f5069a28f7d (patch) | |
| tree | cc2c86b1f0d05e176cc09c6540111ca703a3fc4e /lib/plugins/acl/lang | |
| parent | e5e6f447ba17ba51957a1228e55fe53d8087776a (diff) | |
| parent | a7414518b6cfe45339447419d391a69e58b4afef (diff) | |
| download | rpg-34f7d7455b707c2897c5ccc40c987f5069a28f7d.tar.gz rpg-34f7d7455b707c2897c5ccc40c987f5069a28f7d.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into trailingcolons
Conflicts:
inc/lang/lv/lang.php
inc/lang/pt/lang.php
Diffstat (limited to 'lib/plugins/acl/lang')
| -rw-r--r-- | lib/plugins/acl/lang/lv/lang.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/acl/lang/lv/lang.php b/lib/plugins/acl/lang/lv/lang.php index b50ca42c2..c0acdd733 100644 --- a/lib/plugins/acl/lang/lv/lang.php +++ b/lib/plugins/acl/lang/lv/lang.php @@ -1,8 +1,8 @@ <?php + /** - * latvian language file - * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author Aivars Miška <allefm@gmail.com> */ $lang['admin_acl'] = 'Piekļuves tiesību vadība'; |