Skip to content

Conversation

@alemangui
Copy link
Contributor

This commit removes distribution-file changes from pull request #452

Sorry for the double PR, I had deleted the fork a while ago and I can't seem to edit the original one.

@exussum12
Copy link
Collaborator

There are conflicts here, Can you resolve please (merge master back in)

exussum12 and others added 2 commits March 21, 2016 21:31
# Conflicts:
#	src/editors/checkboxes.js
#	src/editors/extra/list.js
@alemangui
Copy link
Contributor Author

Conflicts solved

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.

2 participants