Merge branch 'mockup-ticket-220' into barceloneta · plone/plone.app.testing@bb20ea4 · GitHub

Commit

Merge branch 'mockup-ticket-220' into barceloneta

Browse files

* mockup-ticket-220:
  Fix tests without P.TinyMCE
  compare to the right value
  Make PLONE_FTP_SERVER tests pass also if they run on Jenkins with the port allocator plugin.
  Revert "Remove P.TinyMCE"
  Remove P.TinyMCE
  Products.TinyMCE won't be in Plone 5 by default

Loading branch information

jaroel committed Feb 13, 2014

2 parents 557f3d0 + ec02465 commit bb20ea4