Merge remote-tracking branch 'origin/3.4' into develop

This commit is contained in:
Laurent Destailleur 2013-05-31 08:11:18 +02:00
commit b8df049f95
3 changed files with 4 additions and 2 deletions

View File

@ -44,6 +44,7 @@ $year = strftime("%Y", time());
$startyear=$year-2;
$endyear=$year;
$langs->load("members");
/*

View File

@ -44,6 +44,7 @@ $year = strftime("%Y", time());
$startyear=$year-2;
$endyear=$year;
$langs->load("members");
/*

View File

@ -46,6 +46,8 @@ $year = strftime("%Y", time());
$startyear=$year-2;
$endyear=$year;
$langs->load("members");
/*
* View
@ -53,8 +55,6 @@ $endyear=$year;
$form=new Form($db);
$langs->load("propal");
llxHeader();
print_fiche_titre($langs->trans("SubscriptionsStatistics"), $mesg);