Merge branch 'dev' into i18n-koKR

1 files changed, 7 insertions, 0 deletions

diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index aa9f18663..6af048b84 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -113,4 +113,11 @@ class FreshRSS_subscription_Controller extends Minz_ActionController {
 			}
 		}
 	}
+
+	/**
+	 * This action displays the bookmarklet page.
+	 */
+	public function bookmarkletAction() {
+		Minz_View::prependTitle(_t('sub.title.subscription_tools') . ' . ');
+	}
 }