The return of AbstractText class
Merge pull request #53 from yakky/master

Clarify versions in readme
Merge pull request #49 from yakky/feature/abstract_text

The return of AbstractText class
Merge pull request #55 from yakky/master

Added documentation on how to extend the plugin

Fixes #26
csrf needs to be before the ckeditor
make field larger
remove ds store
update to ckeditor 4.2
fix to 200px
Merge pull request #61 from divio/feature/ckeditor_4.2

update to ckeditor 4.2
fixes language of add plugin and HTMLTextField
removed a fixed language var
cleanup
Merge pull request #62 from digi604/master

fixes missing language in add plugin
Merge branch 'master' of github.com:divio/djangocms-text-ckeditor

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
this fixes an issue where 4.1 is stripping our plugins from the editor
ensures ckeditor also works inline (as widget) fixes #47
version bump