Merge remote-tracking branch 'origin/master' into activity-graphs

# Conflicts:
#	config/locales/de.yml
#	config/locales/en.yml
This commit is contained in:
Maximilian Grundke
2018-04-25 15:46:38 +02:00
12 changed files with 200 additions and 81 deletions

View File

@@ -58,6 +58,10 @@ div.negative-result {
box-shadow: 0px 0px 11px 1px rgba(222,0,0,1);
}
tr.highlight {
border-top: 2px solid rgba(222,0,0,1);
}
/////////////////////////////////////////////////////////////////////////////////////////////
// StatisticsController: