resolving repo conflicts

This commit is contained in:
Serghey Rodin 2016-06-25 11:07:06 +03:00
commit 704bf770f7
9 changed files with 963 additions and 375 deletions

View file

@ -12,7 +12,7 @@
</form>
</td>
<td class="toggle-all">
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all">
<input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onchange="checkedAll('objects');">
<label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
</td>
<td>