Merge remote-tracking branch 'origin/feat/SLUB-API' into feat/SLUB-API · opacapp/opacclient@ac0792a · GitHub

This repository has been archived by the owner on Dec 25, 2024. It is now read-only.

Commit

Merge remote-tracking branch 'origin/feat/SLUB-API' into feat/SLUB-API

Browse files

# Conflicts:
#	opacclient/libopac/src/main/java/de/geeksfactory/opacclient/OpacApiFactory.java
#	opacclient/libopac/src/main/java/de/geeksfactory/opacclient/apis/SLUB.kt

Loading branch information

StefRe committed Feb 3, 2019

2 parents a49e152 + d02abbd commit ac0792a