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

..

acp

Merge branch 'develop-olympus' into develop

2011-07-15 19:55:38 -04:00

email

Missed one half of bug #54855 whoops

2010-03-02 19:30:37 +00:00

mods

…

captcha_qa.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

captcha_recaptcha.php

Merge branch 'develop-olympus' into develop

2011-05-10 23:32:27 -04:00

common.php

Merge branch 'develop-olympus' into develop

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

groups.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

help_bbcode.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

help_faq.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

index.htm

…

install.php

Merge branch 'develop-olympus' into develop

2011-07-14 20:46:08 +02:00

iso.txt

…

mcp.php

Merge branch 'develop-olympus' into develop

2011-05-23 23:56:55 +02:00

memberlist.php

Merge branch 'develop-olympus' into develop

2011-05-09 22:28:35 -04:00

posting.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

search_ignore_words.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

search_synonyms.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

search.php

Merge branch 'develop-olympus' into develop

2010-12-13 17:14:36 +01:00

ucp.php

Merge branch 'develop-olympus' into develop

2011-06-09 12:47:27 +02:00

viewforum.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

viewtopic.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00