Merge origin/master

This commit is contained in:
LevelX2 2015-08-04 17:55:16 +02:00
commit 068ccdd91e
5 changed files with 165 additions and 2 deletions

View file

@ -60,7 +60,7 @@ public enum CardRepository {
// raise this if db structure was changed
private static final long CARD_DB_VERSION = 41;
// raise this if new cards were added to the server
private static final long CARD_CONTENT_VERSION = 30;
private static final long CARD_CONTENT_VERSION = 31;
private final Random random = new Random();
private Dao<CardInfo, Object> cardDao;