summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2011-04-23 14:44:48 -0700
committerBharat Mediratta <bharat@menalto.com>2011-04-23 14:44:48 -0700
commit923b5ae20a6deed2f1069913143dc1ad9605d5d1 (patch)
tree9559eafca7d4ec15c4fdf9dc62b7cca5edb3af73
parenta469146084e7ba064f171609849c4d8590424f88 (diff)
parent4f27df48da62383ce7ea0a70d5866d2279c49b74 (diff)
Merge branch 'master' of github.com:gallery/gallery3
-rw-r--r--.build_number2
-rw-r--r--modules/gallery/views/upgrader.html.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/.build_number b/.build_number
index cb518a1a..2bf8d285 100644
--- a/.build_number
+++ b/.build_number
@@ -3,4 +3,4 @@
; process. You don't need to edit it. In fact..
;
; DO NOT EDIT THIS FILE BY HAND!
-build_number=116
+build_number=118
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index ad2e3421..70d37dd1 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -27,7 +27,7 @@
<div id="done" style="display: none">
<h1> <?= t("That's it!") ?> </h1>
<p>
- <?= t("Your <a href=\"%url\">Gallery</a> is up to date.",
+ <?= t("Your Gallery is up to date.<br/><a href=\"%url\">Return to your Gallery</a>",
array("url" => html::mark_clean(url::base()))) ?>
</p>
</div>