diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-11-07 03:11:23 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-11-07 03:11:23 +0100 |
| commit | 7b5c6dbedcc3f2877485aad261c2bd837ac9ac0e (patch) | |
| tree | e851666dcacd5d9e131c87d378e9c476ede9b7d5 /phpBB/includes/diff | |
| parent | 7ca63778929d4ba494235533af94b757e00c1369 (diff) | |
| parent | 48e6126094f160729f5199a528a9690cbeff188c (diff) | |
| download | forums-7b5c6dbedcc3f2877485aad261c2bd837ac9ac0e.tar forums-7b5c6dbedcc3f2877485aad261c2bd837ac9ac0e.tar.gz forums-7b5c6dbedcc3f2877485aad261c2bd837ac9ac0e.tar.bz2 forums-7b5c6dbedcc3f2877485aad261c2bd837ac9ac0e.tar.xz forums-7b5c6dbedcc3f2877485aad261c2bd837ac9ac0e.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.
[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.
Diffstat (limited to 'phpBB/includes/diff')
0 files changed, 0 insertions, 0 deletions