anhefti 254255b3ac Merge remote-tracking branch 'origin/dev-1.1.0' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/gbl/api/APIMessage.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java		2021-03-03 13:51:53 +01:00
..
base	Merge remote-tracking branch 'origin/dev-1.1.0' into development	2021-03-03 13:51:53 +01:00
demo	update migration	2020-11-12 15:15:21 +01:00
.gitignore	introduce flyway for data init and migration	2020-02-25 11:56:33 +01:00