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

..

template

Merge pull request #2936 from nickvergessen/ticket/12976

2014-09-10 20:00:52 +02:00

theme

[ticket/13038] Add link to number of posts of user in viewtopic

2014-09-08 17:36:08 +02:00

style.cfg

[ticket/12974] Update nightly build version to 3.2.0-a1-dev

2014-08-12 10:56:20 +02:00