Merge branch '3.8'

Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php
This commit is contained in:
Romain Neutron
2013-10-21 19:05:37 +02:00
8 changed files with 101 additions and 64 deletions

View File

@@ -15,23 +15,6 @@
margin: 0px;
padding: 0px;
}
.ui-content{
height: 85%;
width: 100%;
margin: 0px;
padding: 0px;
display:table;
}
#map {
height: 100%;
width: 100%;
padding: 0px;
display:table-cell;
vertical-align: middle;
text-align: center
}
</style>
{% block stylesheet %}{% endblock %}
{% block icon %}{% endblock %}