Skip to content
  • Jonny Bradley's avatar
    [MRG] Automatic merge, branches/6.x 30756 to 30823 · 7505d087
    Jonny Bradley authored
    Manually fixed conflicts in
    	lib/wiki-plugins/wikiplugin_flash.php
    	lib/wiki-plugins/wikiplugin_file.php
    	lib/wiki-plugins/wikiplugin_youtube.php
    	lib/tikilib.php
    	lib/jquery_tiki/tiki-jquery.js
    	tiki-interactive_trans.php
    	templates/tiki-admin_menu_options.tpl
    (editors please check)
    7505d087