Skip to content

Feature SQL

Tim Schnock requested to merge feature-sql into master

Merge branch 'master' of https://git.fh-aachen.de/java/projektwoche-2019/team2 into Feature-Stats-14

Conflicts:

app/src/main/java/de/fhac/tz1514s/nfcmon/MainActivity.java

app/src/main/java/de/fhac/tz1514s/nfcmon/MainFragment.java

app/src/main/java/de/fhac/tz1514s/nfcmon/MonWaehlen.java

app/src/main/res/layout/activity_main.xml

app/src/main/res/layout/fragment_main.xml

Merge request reports