Merge remote-tracking branch 'upstream/6.1' into 6.1_fix_e265

Conflicts: web_ckeditor4/__openerp__.py
2025-02-22 13:21:25 +02:00 · 2014-07-21 09:31:00 +02:00
parent eb5843a8dd b8bcadd1d8
commit a23dbca2e1
15 changed files with 144 additions and 41 deletions
--- a/web_ckeditor4/init.py
+++ b/web_ckeditor4/init.py
@@ -19,4 +19,3 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-