Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AndroidOnlabKviz2018
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

7d55dd74

Commit 7d55dd74 authored 7 years ago by fpeterfalvi

Downloads
- Plain Diff

Merge branch 'master' of https://git.sch.bme.hu/KGregPFerenc/AndroidOnlabKviz2018

# Conflicts:
#	KvizClient/app/src/main/java/onlab/kvizclient/LobbyActivity.java

parents 48a9aa08 80bb5e42

No related branches found

No related tags found

Loading

Changes 2

Show whitespace changes

Inline Side-by-side

Showing

KvizClient/app/src/main/java/onlab/kvizclient/LobbyActivity.java 2 additions, 2 deletions

...ent/app/src/main/java/onlab/kvizclient/LobbyActivity.java
KvizServer/app/src/main/java/onlab/kvizserver/LobbyActivity.java 79 additions, 15 deletions

...ver/app/src/main/java/onlab/kvizserver/LobbyActivity.java

with 81 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Hosted with by KSZK