Jonas Sulzer ecef285f41 resolve conflicts ...

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>

2019-01-05 00:00:31 +01:00

..

app.php

remove superfluous class path definition

2014-02-11 21:05:37 +01:00

database.xml

fix notnull settings

2014-02-11 21:05:37 +01:00

info.xml

resolve conflicts

2019-01-05 00:00:31 +01:00