Dotclear

Changeset 1217:baf879af43be


Ignore:
Timestamp:
07/20/13 09:33:50 (11 years ago)
Author:
franck <carnet.franck.paul@…>
Branch:
2.5
Parents:
1181:f8f03e180c0a (diff), 1216:690db176f45d (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.
Tags:
2.5.1
Message:

Merging default branch -> 2.5 branch for 2.5.1 release

Files:
7 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • inc/prepend.php

    r1181 r1217  
    44# This file is part of Dotclear 2. 
    55# 
    6 # Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear 
     6# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear 
    77# Licensed under the GPL version 2.0 license. 
    88# See LICENSE file or 
  • inc/prepend.php

    r1179 r1217  
    123123# Constants 
    124124define('DC_ROOT',path::real(dirname(__FILE__).'/..')); 
    125 define('DC_VERSION','2.5.1-dev'); 
     125define('DC_VERSION','2.5.1'); 
    126126define('DC_DIGESTS',dirname(__FILE__).'/digests'); 
    127127define('DC_L10N_ROOT',dirname(__FILE__).'/../locales'); 
Note: See TracChangeset for help on using the changeset viewer.

Sites map