Dotclear


Ignore:
Timestamp:
11/17/13 20:30:21 (12 years ago)
Author:
franck <carnet.franck.paul@…>
Branch:
default
Parents:
2564:c8bf313d697e (diff), 2566:9bf417837888 (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.6

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • inc/prepend.php

    r2557 r2567  
    310310     } 
    311311} 
    312 ?> 
  • inc/prepend.php

    r2566 r2567  
    135135# Constants 
    136136define('DC_ROOT',path::real(dirname(__FILE__).'/..')); 
    137 define('DC_VERSION','2.6.1'); 
     137define('DC_VERSION','2.7-dev'); 
    138138define('DC_DIGESTS',dirname(__FILE__).'/digests'); 
    139139define('DC_L10N_ROOT',dirname(__FILE__).'/../locales'); 
Note: See TracChangeset for help on using the changeset viewer.

Sites map