Changeset 264


Ignore:
Timestamp:
Jun 7, 2017, 11:32:00 PM (7 years ago)
Author:
roby
Message:
 
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/versione.php

    r263 r264  
    11<?php
    2 
    3 <<<<<<< .mine
    42$versione = "2.0 rev 263";
    5 =======
    6 $versione = "2.0 rev 262";
    7 >>>>>>> .r262
    83$version_number = $versione;
    9 <<<<<<< .mine
    104$version = "Eleonline $version_number (<i>Data Release: 7 giugno 2017</i>)";
    11 =======
    12 $version = "Eleonline $version_number (<i>Data Release: 31 maggio 2017</i>)";
    13 >>>>>>> .r262
    145
    156?>

  • trunk/client/versione.php

    r263 r264  
    11<?php
    22
    3 <<<<<<< .mine
    43$versione = "2.0 rev 263";
    5 =======
    6 $versione = "2.0 rev 262";
    7 >>>>>>> .r262
    84$version_number = $versione;
    9 <<<<<<< .mine
    105$version = "Eleonline $version_number (<i>Data Release: 7 giugno 2017</i>)";
    11 =======
    12 $version = "Eleonline $version_number (<i>Data Release: 31 maggio 2017</i>)";
    13 >>>>>>> .r262
    14 
    156
    167?>
Note: See TracChangeset for help on using the changeset viewer.