• jonnybradley's avatar
    [MRG] Automatic merge, trunk 61745 to 61845 · 46b24d4c
    jonnybradley authored
    Conflicts fixed (with tf) on:
            admin/include_general.php
            admin/include_intertiki.php
            db/config/controllers.xml
            lib/core/Search/Indexer.php
            lib/core/Services/Edit/PluginController.php
            lib/core/Tiki/MemoryLimit.php
            lib/prefs/wikiplugin.php
            templates/admin/include_calendar.tpl
            templates/admin/include_print.tpl
    Setup and composer update to follow...
    46b24d4c
Name
Last commit
Last update
..
mode Loading commit data...
codemirror_tiki.js Loading commit data...
index.php Loading commit data...
tiki_codemirror.php Loading commit data...