aboutsummaryrefslogtreecommitdiffstats
path: root/view/fr
diff options
context:
space:
mode:
authorOlivier Migeot <olivier@migeot.org>2011-03-28 12:11:10 +0200
committerOlivier Migeot <olivier@migeot.org>2011-03-28 12:11:10 +0200
commitda546588db1863dd240a4c738644372fc4d183e6 (patch)
treedd6c869207098867aa6c7207f29ab5a2e9b6dc69 /view/fr
parent19d7e7fefeb3d20697d6a7e0b1fc7a16d9127c64 (diff)
parent1f6c6c466a449ba422c4e67744577f6c35b3ce0b (diff)
downloadvolse-hubzilla-da546588db1863dd240a4c738644372fc4d183e6.tar.gz
volse-hubzilla-da546588db1863dd240a4c738644372fc4d183e6.tar.bz2
volse-hubzilla-da546588db1863dd240a4c738644372fc4d183e6.zip
Merge remote branch 'mike/master'
Diffstat (limited to 'view/fr')
-rw-r--r--view/fr/settings.tpl2
1 files changed, 2 insertions, 0 deletions
diff --git a/view/fr/settings.tpl b/view/fr/settings.tpl
index e0334842a..9846219ed 100644
--- a/view/fr/settings.tpl
+++ b/view/fr/settings.tpl
@@ -2,6 +2,8 @@
<div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div>
+$uexport
+
$nickname_block