hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge 3.8

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-12-09 14:01:00 +01:00
parent 9f38823f27
commit 589169299c
29 changed files with 430 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
templates/web/admin/connected-users.html.twig
View File

@@ -67,9 +67,8 @@
<td class="colValue" >{{ data['applications'][5] }}</td>
</tr>
<tr>
{# module witj id 7 has been removed keep it for bc #}
<td class="colTitle" >{{ 'admin::monitor: module comparateur' | trans }}</td>
<td class="colValue" >{{ data['applications'][6] + data['applications'][7] }}</td>
<td class="colValue" >{{ data['applications'][6] }}</td>
</tr>
{% if data['applications'][0] != 0 %}
<tr>