Dotclear

Changeset 2557:70bc5ba039a0


Ignore:
Timestamp:
11/15/13 15:07:36 (12 years ago)
Author:
franck <carnet.franck.paul@…>
Branch:
default
Parents:
2551:796e952272dc (diff), 2556:5567b0e7d451 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • inc/prepend.php

    r2555 r2557  
    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