Skip to content

Commit

Permalink
Merge remote-tracking branch 'gustav9797/master' into merge-API-into-…
Browse files Browse the repository at this point in the history
…repo

# Conflicts:
#	pom.xml
  • Loading branch information
sebastianbinder committed Oct 10, 2017
2 parents 79f7ec3 + 2d335e9 commit d40ded8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@
<version>2.13.3</version>
</dependency>
</dependencies>
</project>
</project>

0 comments on commit d40ded8

Please sign in to comment.