Skip to content

Commit

Permalink
Merge branch '2.6' into 2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
xabbuh committed Jul 15, 2015
2 parents 2cd9477 + 77fb9c7 commit 9755846
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion cookbook/security/voters_data_permission.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ edit a particular object. Here's an example implementation:
}
break;
}
return false;
}
}
Expand Down

0 comments on commit 9755846

Please sign in to comment.