diff options
| author | lisps <stummp@loewen.de> | 2014-02-17 23:15:36 +0100 |
|---|---|---|
| committer | lisps <stummp@loewen.de> | 2014-02-17 23:15:36 +0100 |
| commit | d90a79c0ee1837353622e4b2abb0753ca09dffd2 (patch) | |
| tree | 554da8dc13606efc2bc1ea7fe3697a5ff87d02e5 /lib/plugins/acl/lang/no | |
| parent | f2643d9ff318af1d2fbb6249e929212381959247 (diff) | |
| parent | a83975113c7725a13144b3e65bfb58c8447d37d7 (diff) | |
| download | rpg-d90a79c0ee1837353622e4b2abb0753ca09dffd2.tar.gz rpg-d90a79c0ee1837353622e4b2abb0753ca09dffd2.tar.bz2 | |
Merge remote-tracking branch 'origin/diff_navigation' into revisions
Conflicts:
inc/parser/xhtml.php
Diffstat (limited to 'lib/plugins/acl/lang/no')
| -rw-r--r-- | lib/plugins/acl/lang/no/lang.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/plugins/acl/lang/no/lang.php b/lib/plugins/acl/lang/no/lang.php index 09d71937a..82cdd5eef 100644 --- a/lib/plugins/acl/lang/no/lang.php +++ b/lib/plugins/acl/lang/no/lang.php @@ -1,8 +1,8 @@ <?php + /** - * Norwegian language file - * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author Reidar Mosvold <Reidar.Mosvold@hit.no> * @author Jorge Barrera Grandon <jorge@digitalwolves.org> * @author Thomas Nygreen <nygreen@gmail.com> @@ -10,7 +10,7 @@ * @author Torkill Bruland <torkar-b@online.no> * @author Rune M. Andersen <rune.andersen@gmail.com> * @author Jakob Vad Nielsen (me@jakobnielsen.net) - * @author Kjell Tore Næsgaard <kjell.t.nasgaard@ntnu.no> + * @author Kjell Tore Næsgaard <kjell.t.nasgaard@ntnu.no> * @author Knut Staring <knutst@gmail.com> * @author Lisa Ditlefsen <lisa@vervesearch.com> * @author Erik Pedersen <erik.pedersen@shaw.ca> |