diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-10 20:02:20 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-09-10 20:02:20 +0200 |
| commit | d465e7e438f7313155f095f96c806e72571a58bb (patch) | |
| tree | 6ef624338161d2fc41bade0ee436e76dd7f3caf4 /phpBB/styles | |
| parent | d320897180396648c0737303e048201d286c2d15 (diff) | |
| parent | c842583bbf0977a3fa44fdf07e42779d66773427 (diff) | |
| download | forums-d465e7e438f7313155f095f96c806e72571a58bb.tar forums-d465e7e438f7313155f095f96c806e72571a58bb.tar.gz forums-d465e7e438f7313155f095f96c806e72571a58bb.tar.bz2 forums-d465e7e438f7313155f095f96c806e72571a58bb.tar.xz forums-d465e7e438f7313155f095f96c806e72571a58bb.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12976] Correctly use plurals for attachment count in UCP navigation
Conflicts:
phpBB/styles/subsilver2/template/ucp_attachments.html
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_attachments.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html index ddbf892dee..1d4963273c 100644 --- a/phpBB/styles/prosilver/template/ucp_attachments.html +++ b/phpBB/styles/prosilver/template/ucp_attachments.html @@ -12,7 +12,7 @@ <!-- IF .attachrow --> <div class="action-bar top"> <div class="pagination"> - {TOTAL_ATTACHMENTS} {L_TITLE} + {NUM_ATTACHMENTS} <!-- IF .pagination --> <!-- INCLUDE pagination.html --> <!-- ELSE --> |