Merge branch 'release/4.3' into feature/rails4

Signed-off-by: Alex Coles <alex@alexbcoles.com>
pull/3220/head
Alex Coles 9 years ago
commit a47207b510
  1. 2
      app/views/timelog/_list.html.erb

@ -59,7 +59,7 @@ See doc/COPYRIGHT.rdoc for more details.
<a ng-href="{{PathHelper.timeEntryEditPath(timeEntry.id)}}" class="no-decoration-on-hover">
<icon-wrapper icon-name="edit" icon-title="{{I18n.t('js.button_edit')}}"></icon-wrapper>
</a>
<a ng-click="deleteTimeEntry(timeEntry.id)" href="#" class="no-decoration-on-hover">
<a ng-click="deleteTimeEntry(timeEntry.id)" href="" class="no-decoration-on-hover">
<icon-wrapper icon-name="delete" icon-title="{{I18n.t('js.button_delete')}}"></icon-wrapper>
</a>
</span>

Loading…
Cancel
Save