Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 3.2.x #5119

Merged
merged 6 commits into from Apr 1, 2016
Merged

Merge 3.2.x #5119

merged 6 commits into from Apr 1, 2016

Conversation

yakky
Copy link
Member

@yakky yakky commented Mar 31, 2016

No description provided.

return r !== '0';
});
var currentPluginType = this.options.plugin_type;
if (clipboardPlugin.data('settings')) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vxsx could you check if this is the correct way to port #5097 FE code?

@vxsx
Copy link
Contributor

vxsx commented Mar 31, 2016

👍

@coveralls
Copy link

Coverage Status

Coverage decreased (-6.0%) to 81.341% when pulling 383ccf5 on yakky:merge/3.2.3.post1 into 391f2ec on divio:develop.

@coveralls
Copy link

coveralls commented Apr 1, 2016

Coverage Status

Coverage decreased (-6.0%) to 81.341% when pulling 383ccf5 on yakky:merge/3.2.3.post1 into 391f2ec on divio:develop.

@yakky yakky merged commit f10daf7 into django-cms:develop Apr 1, 2016
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.

None yet

3 participants