Permalink
Browse files

Merge branch 'develop' into new_i18n

  • Loading branch information...
2 parents e691fbd + 3bef8a7 commit a8aca61b562e8f826339627c7e6af4286f73194d @digi604 digi604 committed Sep 24, 2012
Showing with 4 additions and 5 deletions.
  1. +2 −0 CHANGELOG.txt
  2. +2 −5 cms/static/cms/wymeditor/jquery.wymeditor.js
View
@@ -105,7 +105,9 @@
- Made the PageAttribute templatetag an 'asTag'
- JQuery namespace fixes in admin
+==== 2.3.3 ====
+ - fixed an incompatibility with Python 2.5
@@ -724,10 +724,7 @@ WYMeditor.computeWymPath = function () {
return (
s.src.match(
/jquery\.wymeditor(\.pack|\.min|\.packed)?\.js(\?.*)?$/
- ) ||
- s.src.match(
- /\/core\.js(\?.*)?$/
- )
+ )
);
}
)
@@ -1695,7 +1692,7 @@ rangy.createModule("DomUtil", function(api, module) {
var dom = api.dom;
var DomPosition = dom.DomPosition;
var DOMException = api.DOMException;
-
+
/*----------------------------------------------------------------------------------------------------------------*/
// Utility functions

0 comments on commit a8aca61

Please sign in to comment.