History | View | Annotate | Download (24.5 kB)
commit bafe3d9484037049a766fc1f9d728979d2d0483aMerge: 85e0ae7 c3a4312Author: Andreas Fischer <bantu@phpbb.com>Date: Sun Jan 30 01:17:06 2011 +0100
Merge branch 'develop-olympus' into develop
commit adfa1656fb9d8b5bb601af1d7a6720884954d87aMerge: bd579c8 af5b9a9Author: Nils Adermann <naderman@naderman.de>Date: Mon Dec 13 16:35:55 2010 +0100
Merge branch 'ticket/igorw/9556' into develop
Copy 3.0.x branch to trunk
Props.
some corrections, only very minor things.
Fix DOS line endings, evil<3 this doesn't count as spam you told me to :P
Fix up and tidy :)
Okay, a first ci of the new captcha plugins. We'll add dynamic template includes later, as well as documentation on how to use this. I'm prepared to get yelled at for bugs (oh, I know that there are plenty); but please blame spammers for broken styles and MODs.
and why not this as well?