Merge branch 'master' into permanent-share-icons

a78ae6a5 · Jan-Christoph Borchardt · 31ebea0f · 06c1c35a · a78ae6a5 · a78ae6a5
Commit a78ae6a5 authored 12 years ago by Jan-Christoph Borchardt
--- a/lib/base.php
+++ b/lib/base.php
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
--- a/lib/l10n/lb.php
+++ b/lib/l10n/lb.php
--- a/lib/mail.php
+++ b/lib/mail.php
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
--- a/lib/user.php
+++ b/lib/user.php
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php