Merge branch '3.8'

Conflicts:
	lib/classes/task/Scheduler.php
	templates/web/admin/user/demand.html.twig
This commit is contained in:
Nicolas Le Goff
2014-02-06 17:39:41 +01:00
2 changed files with 7 additions and 1 deletions

View File

@@ -292,3 +292,7 @@ div.switch_right.unchecked {
#tab_demandes .dl-horizontal dt {
width: 130px;
}
#tab_demandes .table .btn-group {
display: block;
}