Merge branch 'master' into glitch-soc/merge-upstream

This commit is contained in:
Thibaut Girka committed 2019-08-12 16:24:22 +02:00
commit c4ae7aab6f
24 files changed
+214 -120

No files matched your search

+1 -1
View File
@@ -71,7 +71,7 @@ module Admin
now = Time.now.utc.beginning_of_day.to_date
(Date.commercial(now.cwyear, now.cweek)..now).map do |date|
date.to_time.utc.beginning_of_day.to_i
date.to_time(:utc).beginning_of_day.to_i
end
end
end