Kevin Gilmore 48cd384ea0 Merge remote-tracking branch 'upstream/master' ... # Conflicts: # spring-security-custom-voter/src/main/java/org/baeldung/security/MinuteBasedVoter.java		2016-10-23 12:27:54 -05:00
..
src	Merge remote-tracking branch 'upstream/master'	2016-10-23 12:27:54 -05:00
pom.xml	[BAEL-123] Created an example about custom AccessDecisionVoters in Spring Security. (#728)	2016-10-22 07:50:19 -05:00