Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x

diff --git a/lib/designsettings.php b/lib/designsettings.php
index a48ec9d2274531fecdfd24a39af3f3080dfdabee..b86265971c6645012dc030fcdc947f64e2ffc737 100644 (file)
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -326,6 +326,7 @@ class DesignSettingsAction extends AccountSettingsAction
 
         $this->script('js/farbtastic/farbtastic.js');
         $this->script('js/farbtastic/farbtastic.go.js');
+        $this->script('js/userdesign.go.js');
     }
 
     /**