Skip to content

GitLab

don
don
Commit 486e03ed authored by okhin's avatar okhin 🚴
Browse files
Options

Merge branch 'preprod' into 'master' 

Preprod

See merge request !108
parents 0dd800ee 4b6a8a0c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
app/controller/admin.php
View file @ 486e03ed
......@@ -1001,7 +1001,7 @@ class Admin extends Controller
$time_struct['tm_sec'],
$time_struct['tm_mon']+1,
$time_struct['tm_mday'],
$time_struct['tm_year']
$time_struct['tm_year']+1900
));
$cb['expiration'] = $new_expiration;
if ($data['status'] == '') {
......@@ -1357,7 +1357,7 @@ class Admin extends Controller
$time_struct['tm_sec'],
$time_struct['tm_mon']+1,
$time_struct['tm_mday'],
$time_struct['tm_year']
$time_struct['tm_year']+1900
));
// Pour un don récurrent, on recherche son équivalent qui peut ne pas exister
$result = $db->query("SELECT email
......
app/view/campaign/faq.html
View file @ 486e03ed
......@@ -193,10 +193,10 @@
</div>
<div class="panel panel-default blue collapsible collapsible-white-pure">
<input id="action13" type="checkbox">
<input id="action17" type="checkbox">
<div class="panel-heading">
<h4>
<label for="action13">{{ _("Quand recevrai-je mon t-shirt&nbsp;?") }}<span class="panel-caret pull-right"></span></label>
<label for="action17">{{ _("Quand recevrai-je mon t-shirt&nbsp;?") }}<span class="panel-caret pull-right"></span></label>
</h4>
</div>
<div class="collapsed ">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment