Show
Ignore:
Timestamp:
12/24/07 15:00:10 (13 months ago)
Author:
www-data
Message:

automerge commit

Location:
team/michiel/input_formats
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • team/michiel/input_formats

    • Property svnmerge-integrated changed from /trunk:1-733 to /trunk:1-735
  • team/michiel/input_formats/common/mvblog_admin.php

    r726 r736  
    12961296                <script language="javascript" type="text/javascript"> 
    12971297                tinyMCE_GZ.init({ 
    1298                         plugins    : "spellchecker,autosave,inlinepopups,table,advhr,advimage,advlink,flash,paste,noneditable,contextmenu", 
     1298                        plugins    : "spellchecker,inlinepopups,table,advhr,advimage,advlink,flash,paste,noneditable,contextmenu", 
    12991299                        themes     : "advanced", 
    13001300                        languages  : "en",