Merge branch 'hotfix/3.1.4'

contao · Oct 14, 2013 · 40f6d26 · 40f6d26
2 parents 67b266f + 6c45d36
commit 40f6d26
Show file tree

Hide file tree

Showing 77 changed files with 988 additions and 2,864 deletions.
diff --git a/assets/tinymce/plugins/spellchecker/changelog.txt b/assets/tinymce/plugins/spellchecker/changelog.txt
diff --git a/assets/tinymce/plugins/spellchecker/classes/EnchantSpell.php b/assets/tinymce/plugins/spellchecker/classes/EnchantSpell.php
diff --git a/assets/tinymce/plugins/spellchecker/classes/GoogleSpell.php b/assets/tinymce/plugins/spellchecker/classes/GoogleSpell.php
diff --git a/assets/tinymce/plugins/spellchecker/classes/PSpell.php b/assets/tinymce/plugins/spellchecker/classes/PSpell.php