]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #4271 from owncloud/plural_translations
authorOwen Winkler <a_github@midnightcircus.com>
Thu, 8 Aug 2013 17:34:28 +0000 (10:34 -0700)
committerOwen Winkler <a_github@midnightcircus.com>
Thu, 8 Aug 2013 17:34:28 +0000 (10:34 -0700)
Plural translations

1  2 
core/js/js.js
lib/l10n.php

diff --cc core/js/js.js
Simple merge
diff --cc lib/l10n.php
Simple merge