diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2011-05-12 23:48:54 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2011-05-12 23:48:54 +0000 |
| commit | 2ad445441974c64599df496ba4a585415aa41169 (patch) | |
| tree | 49b2860fdac2d2ff16134bfa2aa8d8a972b93301 /modules/gallery/views/upgrader.html.php | |
| parent | 1f7c1f18c651c58048e92d615c71ac0fe6691c10 (diff) | |
| parent | 9aeb824aa1d15bd94bd7cef0a322c4e8a667e67b (diff) | |
Manually merged a conflict after pulling from upstream.
Diffstat (limited to 'modules/gallery/views/upgrader.html.php')
| -rw-r--r-- | modules/gallery/views/upgrader.html.php | 2 |
1 files changed, 1 insertions, 1 deletions
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> |