Skip to content

Merge Seperate Tree#14

Open
Maxqia wants to merge 17 commits intodennylin93:masterfrom
cdsim:master
Open

Merge Seperate Tree#14
Maxqia wants to merge 17 commits intodennylin93:masterfrom
cdsim:master

Conversation

@Maxqia
Copy link
Copy Markdown

@Maxqia Maxqia commented Sep 18, 2015

I'd like to merge the two trees for support for the new recapcha api, and the nocapcha recapcha.
Also for https://plugins.roundcube.net/ support.

@dennylin93
Copy link
Copy Markdown
Owner

There are conflicts in this pull request which need to be resolved. Since there are also significant changes, can you also confirm all the modifications will be under the original license (BSD license)? Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants