diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-11-07 03:10:57 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-11-07 03:10:57 +0100 |
| commit | 48e6126094f160729f5199a528a9690cbeff188c (patch) | |
| tree | b310a1036d68e75d1ebc079cf55760bff83a7310 /phpBB/includes/utf/utf_normalizer.php | |
| parent | f7180f44303e441005f0b1f4d652657b9f406642 (diff) | |
| parent | 5d9a9d68744e083997dea9ea9773b98241109b79 (diff) | |
| parent | 71b35a924f7a5f517e8d07d975582c27813f5797 (diff) | |
| download | forums-48e6126094f160729f5199a528a9690cbeff188c.tar forums-48e6126094f160729f5199a528a9690cbeff188c.tar.gz forums-48e6126094f160729f5199a528a9690cbeff188c.tar.bz2 forums-48e6126094f160729f5199a528a9690cbeff188c.tar.xz forums-48e6126094f160729f5199a528a9690cbeff188c.zip | |
Merge remote branches 'github-bantu/ticket/9879' and 'github-cs278/ticket/9095' into develop-olympus
* github-bantu/ticket/9879:
[ticket/9879] Fix markup and use Q&A instead of Q & A for consistency.
[ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA.
* github-cs278/ticket/9095:
[ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.