Skip to content

Commit

Permalink
Merge branch 'hotfix/1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
emcrisostomo committed Jul 8, 2016
2 parents 4764f70 + 3c4b2e0 commit a3bfdea
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ([2.69])
AC_INIT([GoogleAuth], [1.1.0], [[email protected]])
AC_INIT([GoogleAuth], [1.1.1], [[email protected]])
AC_CONFIG_AUX_DIR([config])

# Initialize Automake
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<groupId>com.warrenstrange</groupId>
<artifactId>googleauth</artifactId>
<version>1.1.0</version>
<version>1.1.1</version>
<packaging>jar</packaging>

<name>${project.groupId}:${project.artifactId}</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ public int getTotpPassword(String secret, long time)

public int getTotpPasswordOfUser(String userName)
{
return getTotpPassword(userName, new Date().getTime());
return getTotpPasswordOfUser(userName, new Date().getTime());
}

public int getTotpPasswordOfUser(String userName, long time)
Expand Down

0 comments on commit a3bfdea

Please sign in to comment.