phpbb/phpBB/styles
Tristan Darricau d465e7e438 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
2014-09-10 20:02:20 +02:00
..
prosilver Merge branch 'develop-ascraeus' into develop 2014-09-10 20:02:20 +02:00