Commit ec5d9eba authored 9 years ago by Frantisek Simon

Merge remote-tracking branch 'remotes/origin/devel' into feature-rest-server

Conflicts:
	core/src/cz/nic/tablexia/game/AbstractTablexiaGame.java
	core/src/cz/nic/tablexia/game/games/kidnapping/KidnappingGame.java
	core/src/cz/nic/tablexia/model/game/GameDAO.java
	core/src/cz/nic/tablexia/screen/profile/ProfileScreen.java

parents 8024947f 222523b9

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 5 additions and 5 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'remotes/origin/devel' into feature-rest-server