Merge remote-tracking branch 'origin/moderation' into moderation

This commit is contained in:
Andreas N 2014-12-27 15:59:30 +01:00
commit 70f629582e

View file

@ -26,7 +26,7 @@
%a{href: '#', data: { a_id: a.id, action: 'ab-destroy' }} %a{href: '#', data: { a_id: a.id, action: 'ab-destroy' }}
%i.fa.fa-trash-o %i.fa.fa-trash-o
Delete Delete
%li %li
%a{href: '#', name: 'ab-report', data: { a_id: a.id }} %a{href: '#', data: { a_id: a.id, action: 'ab-report' }}
%i.fa.fa-exclamation-triangle %i.fa.fa-exclamation-triangle
Report Report