Andreas Fischer b809bea3d4 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10549] using correct variable in includes/functions_module.php too
  [ticket/10549] changed "right" to "incorrect"

Conflicts:
	phpBB/includes/functions_module.php

2014-03-12 16:28:47 +01:00

..

acp

Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop

2014-03-10 21:51:07 -05:00

email

Merge branch 'develop-olympus' into develop

2013-11-19 15:28:37 +01:00

mods

…

app.php

…

captcha_qa.php

…

captcha_recaptcha.php

…

common.php

Merge branch 'develop-olympus' into develop

2014-03-12 16:28:47 +01:00

groups.php

…

help_bbcode.php

…

help_faq.php

…

index.htm

…

install.php

…

iso.txt

…

mcp.php

…

memberlist.php

[ticket/12236] Move AOL Instant Messanger field to custom profile field

2014-03-05 22:13:22 +01:00

migrator.php

[ticket/11883] Report completed data step in migration as "Installing Data"

2013-10-02 14:27:46 -05:00

plupload.php

[ticket/12206] Fix mismatched Plupload language vars preventing localization.

2014-02-17 12:33:19 -08:00

posting.php

[ticket/11894] Fix typo in "Delete post" option

2013-10-05 20:59:07 -07:00

search_ignore_words.php

…

search_synonyms.php

…

search.php

[ticket/12096] Use plurals for MAX_NUM_SEARCH_KEYWORDS_REFINE.

2014-01-16 11:48:40 -08:00

ucp.php

[ticket/12251] Add string validation for a-zA-Z0-9 and underscore

2014-03-06 12:28:36 +01:00

viewforum.php

…

viewtopic.php

[ticket/12187] Remove user_website functionality

2014-03-03 20:01:19 +01:00