Nils Adermann 19925ad059 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10237] Also display login-box on subscribing
  [ticket/10237] Handle watching and unwatching the same way.
  [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions

Conflicts:
	phpBB/includes/functions_display.php

2011-07-16 21:57:16 -04:00

..

en

Merge branch 'develop-olympus' into develop

2011-07-16 21:57:16 -04:00

index.htm

…