diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-09 01:23:29 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-12-09 01:23:29 +0100 |
| commit | d252ef3f604b64025a7bc3723c1939c118832248 (patch) | |
| tree | 2519b1e549af4401c14e5b29a43055e6afd154be | |
| parent | d5742d7ec1efd800ebd420ab13bf9523ac7a5f3f (diff) | |
| parent | 6658cd279cd93266c9124601df0a95fd16172d54 (diff) | |
| download | forums-d252ef3f604b64025a7bc3723c1939c118832248.tar forums-d252ef3f604b64025a7bc3723c1939c118832248.tar.gz forums-d252ef3f604b64025a7bc3723c1939c118832248.tar.bz2 forums-d252ef3f604b64025a7bc3723c1939c118832248.tar.xz forums-d252ef3f604b64025a7bc3723c1939c118832248.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12061] Fix keyboard shortcut in firefox
Conflicts:
phpBB/styles/prosilver/template/overall_footer.html
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index bbffe8dc3d..f7d0269edb 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -7,7 +7,7 @@ <div class="inner"> <ul class="linklist bulletin"> - <li class="small-icon icon-home breadcrumbs"><!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>‹</strong></span> <!-- ENDIF --><span class="crumb"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></span> + <li class="small-icon icon-home breadcrumbs"><!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}">{L_SITE_HOME}</a> <strong>‹</strong></span> <!-- ENDIF --><span class="crumb"><a href="{U_INDEX}">{L_INDEX}</a></span> <!-- EVENT overall_footer_breadcrumb_append --> </li> <!-- IF not S_IS_BOT --> |