Dotclear

Changeset 3311:d3b4a1c2711f


Ignore:
Timestamp:
08/15/16 09:47:06 (9 years ago)
Author:
franck <carnet.franck.paul@…>
Branch:
default
Parents:
3308:24ab3c35b8f4 (diff), 3310:ed3ad37ec3cf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from 2.10.1

File:
1 edited

Legend:

Unmodified
Added
Removed
  • inc/prepend.php

    r3309 r3311  
    142142# Constants 
    143143define('DC_ROOT',path::real(dirname(__FILE__).'/..')); 
    144 define('DC_VERSION','2.10.1'); 
     144define('DC_VERSION','2.11-dev'); 
    145145define('DC_DIGESTS',dirname(__FILE__).'/digests'); 
    146146define('DC_L10N_ROOT',dirname(__FILE__).'/../locales'); 
Note: See TracChangeset for help on using the changeset viewer.

Sites map